summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-16 01:15:49 +0100
committerDavid Disseldorp <ddiss@samba.org>2013-01-17 17:11:37 +0100
commit8304fe73f69ea7de57bd2d331038c4664553a9bd (patch)
treecad9cb9aa73651190673f499d9342a7f5212759a /source4
parentbe8c81bfa3c6a2727eab589a71c6215ca76e3d3a (diff)
downloadsamba-8304fe73f69ea7de57bd2d331038c4664553a9bd.tar.gz
samba-8304fe73f69ea7de57bd2d331038c4664553a9bd.tar.bz2
samba-8304fe73f69ea7de57bd2d331038c4664553a9bd.zip
spoolss: make spoolss deal with ndr64 AddForm by using proper container object.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/ntptr/simple_ldb/ntptr_simple_ldb.c26
-rw-r--r--source4/torture/rpc/spoolss.c11
2 files changed, 20 insertions, 17 deletions
diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index 04e3806853..d8bb754bd7 100644
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -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;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 49a0be68e2..25625829f4 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -2671,18 +2671,21 @@ static bool test_AddForm(struct torture_context *tctx,
WERROR expected_result)
{
struct spoolss_AddForm r;
+ struct spoolss_AddFormInfoCtr info_ctr;
+
+ info_ctr.level = level;
+ info_ctr.info = *info;
if (level != 1) {
torture_skip(tctx, "only level 1 supported");
}
r.in.handle = handle;
- r.in.level = level;
- r.in.info = *info;
+ r.in.info_ctr = &info_ctr;
torture_comment(tctx, "Testing AddForm(%s) level %d, type %d\n",
- r.in.info.info1->form_name, r.in.level,
- r.in.info.info1->flags);
+ r.in.info_ctr->info.info1->form_name, level,
+ r.in.info_ctr->info.info1->flags);
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_AddForm_r(b, tctx, &r),
"AddForm failed");