sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

spoolss: make spoolss deal with ndr64 AddForm by using proper container object.

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Günther Deschner
2013-01-16 01:15:49 +01:00
committed by David Disseldorp
parent be8c81bfa3
commit 8304fe73f6
6 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source4/ntptr/simple_ldb/ntptr_simple_ldb.c
View File

@ -319,21 +319,21 @@ static WERROR sptr_AddPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
* }
*/
switch (r->in.level) {
switch (r->in.info_ctr->level) {
case 1:
if (!r->in.info.info1) {
if (!r->in.info_ctr->info.info1) {
return WERR_FOOBAR;
}
count = sptr_db_search(sptr_db, mem_ctx,
ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
&msgs, attrs, "(&(form-name=%s)(objectClass=form))",
r->in.info.info1->form_name);
r->in.info_ctr->info.info1->form_name);
if (count == 1) return WERR_FOOBAR;
if (count > 1) return WERR_FOOBAR;
if (count < 0) return WERR_GENERAL_FAILURE;
if (r->in.info.info1->flags != SPOOLSS_FORM_USER) {
if (r->in.info_ctr->info.info1->flags != SPOOLSS_FORM_USER) {
return WERR_FOOBAR;
}
@ -341,20 +341,20 @@ static WERROR sptr_AddPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
W_ERROR_HAVE_NO_MEMORY(msg);
/* add core elements to the ldb_message for the Form */
msg->dn = ldb_dn_new_fmt(msg, sptr_db, "form-name=%s,CN=Forms,CN=PrintServer", r->in.info.info1->form_name);
msg->dn = ldb_dn_new_fmt(msg, sptr_db, "form-name=%s,CN=Forms,CN=PrintServer", r->in.info_ctr->info.info1->form_name);
SET_STRING(sptr_db, msg, "objectClass", "form");
SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
SET_UINT(sptr_db, msg, "flags", r->in.info_ctr->info.info1->flags);
SET_STRING(sptr_db, msg, "form-name", r->in.info.info1->form_name);
SET_STRING(sptr_db, msg, "form-name", r->in.info_ctr->info.info1->form_name);
SET_UINT(sptr_db, msg, "size-width", r->in.info.info1->size.width);
SET_UINT(sptr_db, msg, "size-height", r->in.info.info1->size.height);
SET_UINT(sptr_db, msg, "size-width", r->in.info_ctr->info.info1->size.width);
SET_UINT(sptr_db, msg, "size-height", r->in.info_ctr->info.info1->size.height);
SET_UINT(sptr_db, msg, "area-left", r->in.info.info1->area.left);
SET_UINT(sptr_db, msg, "area-top", r->in.info.info1->area.top);
SET_UINT(sptr_db, msg, "area-right", r->in.info.info1->area.right);
SET_UINT(sptr_db, msg, "area-bottom", r->in.info.info1->area.bottom);
SET_UINT(sptr_db, msg, "area-left", r->in.info_ctr->info.info1->area.left);
SET_UINT(sptr_db, msg, "area-top", r->in.info_ctr->info.info1->area.top);
SET_UINT(sptr_db, msg, "area-right", r->in.info_ctr->info.info1->area.right);
SET_UINT(sptr_db, msg, "area-bottom", r->in.info_ctr->info.info1->area.bottom);
break;
default:
return WERR_UNKNOWN_LEVEL;