[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1015-g81aca44
Günther Deschner
gd at samba.org
Mon Apr 13 14:12:19 GMT 2009
The branch, master has been updated
via 81aca44d30783d1c162498a257fc47cc44a649fb (commit)
via 609e401b976a99ad82e37c2c3617684c8bb3e6c4 (commit)
via 3918ee88701942c35dc8ed957d507076ead8d3f5 (commit)
from 94d3047de19a73c30f218d13a4847a4d354a61aa (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 81aca44d30783d1c162498a257fc47cc44a649fb
Author: Günther Deschner <gd at samba.org>
Date: Mon Apr 13 14:48:32 2009 +0200
s4-smbtorture: use printerinfo level 1 name, not description in
test_EnumPrinters_old().
Guenther
commit 609e401b976a99ad82e37c2c3617684c8bb3e6c4
Author: Günther Deschner <gd at samba.org>
Date: Mon Apr 13 14:16:04 2009 +0200
s3: re-run make samba3-idl.
Guenther
commit 3918ee88701942c35dc8ed957d507076ead8d3f5
Author: Günther Deschner <gd at samba.org>
Date: Mon Apr 13 14:15:21 2009 +0200
spoolss: fix order of strings in PrinterInfo1 structs.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 142 ++++++++++++++++++++--------------------
librpc/gen_ndr/spoolss.h | 4 +-
librpc/idl/spoolss.idl | 4 +-
source4/torture/rpc/spoolss.c | 15 +++-
4 files changed, 86 insertions(+), 79 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index f5b161a..2085fa3 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -771,13 +771,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->name));
+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->description));
ndr->flags = _flags_save_string;
}
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->description));
+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->name));
ndr->flags = _flags_save_string;
}
{
@@ -791,18 +791,18 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->name) {
- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->name));
- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name));
+ if (r->description) {
+ NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description));
}
ndr->flags = _flags_save_string;
}
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->description) {
- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description));
- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description));
+ if (r->name) {
+ NDR_CHECK(ndr_push_relative_ptr2(ndr, r->name));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name));
}
ndr->flags = _flags_save_string;
}
@@ -821,10 +821,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i
_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r)
{
- uint32_t _ptr_name;
- TALLOC_CTX *_mem_save_name_0;
uint32_t _ptr_description;
TALLOC_CTX *_mem_save_description_0;
+ uint32_t _ptr_name;
+ TALLOC_CTX *_mem_save_name_0;
uint32_t _ptr_comment;
TALLOC_CTX *_mem_save_comment_0;
if (ndr_flags & NDR_SCALARS) {
@@ -833,24 +833,24 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
- if (_ptr_name) {
- NDR_PULL_ALLOC(ndr, r->name);
- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->name, _ptr_name));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description));
+ if (_ptr_description) {
+ NDR_PULL_ALLOC(ndr, r->description);
+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->description, _ptr_description));
} else {
- r->name = NULL;
+ r->description = NULL;
}
ndr->flags = _flags_save_string;
}
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description));
- if (_ptr_description) {
- NDR_PULL_ALLOC(ndr, r->description);
- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->description, _ptr_description));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
+ if (_ptr_name) {
+ NDR_PULL_ALLOC(ndr, r->name);
+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->name, _ptr_name));
} else {
- r->description = NULL;
+ r->name = NULL;
}
ndr->flags = _flags_save_string;
}
@@ -871,14 +871,14 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->name) {
+ if (r->description) {
uint32_t _relative_save_offset;
_relative_save_offset = ndr->offset;
- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->name));
- _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->name, 0);
- NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->name));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->description));
+ _mem_save_description_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->description, 0);
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->description));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_description_0, 0);
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -886,14 +886,14 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->description) {
+ if (r->name) {
uint32_t _relative_save_offset;
_relative_save_offset = ndr->offset;
- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->description));
- _mem_save_description_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->description, 0);
- NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->description));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_description_0, 0);
+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->name));
+ _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->name, 0);
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->name));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -922,18 +922,18 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo1(struct ndr_print *ndr, const char *
ndr_print_struct(ndr, name, "spoolss_PrinterInfo1");
ndr->depth++;
ndr_print_spoolss_EnumPrinterFlags(ndr, "flags", r->flags);
- ndr_print_ptr(ndr, "name", r->name);
- ndr->depth++;
- if (r->name) {
- ndr_print_string(ndr, "name", r->name);
- }
- ndr->depth--;
ndr_print_ptr(ndr, "description", r->description);
ndr->depth++;
if (r->description) {
ndr_print_string(ndr, "description", r->description);
}
ndr->depth--;
+ ndr_print_ptr(ndr, "name", r->name);
+ ndr->depth++;
+ if (r->name) {
+ ndr_print_string(ndr, "name", r->name);
+ }
+ ndr->depth--;
ndr_print_ptr(ndr, "comment", r->comment);
ndr->depth++;
if (r->comment) {
@@ -5960,23 +5960,23 @@ static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo1(struct ndr_push *ndr,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_spoolss_EnumPrinterFlags(ndr, NDR_SCALARS, r->flags));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->description));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
}
if (ndr_flags & NDR_BUFFERS) {
- if (r->name) {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF16)));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF16)));
- NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
- }
if (r->description) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->description, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->description, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->description, ndr_charset_length(r->description, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
+ if (r->name) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+ }
if (r->comment) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -5989,27 +5989,27 @@ static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo1(struct ndr_push *ndr,
static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_SetPrinterInfo1 *r)
{
- uint32_t _ptr_name;
- TALLOC_CTX *_mem_save_name_0;
uint32_t _ptr_description;
TALLOC_CTX *_mem_save_description_0;
+ uint32_t _ptr_name;
+ TALLOC_CTX *_mem_save_name_0;
uint32_t _ptr_comment;
TALLOC_CTX *_mem_save_comment_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_spoolss_EnumPrinterFlags(ndr, NDR_SCALARS, &r->flags));
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
- if (_ptr_name) {
- NDR_PULL_ALLOC(ndr, r->name);
- } else {
- r->name = NULL;
- }
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description));
if (_ptr_description) {
NDR_PULL_ALLOC(ndr, r->description);
} else {
r->description = NULL;
}
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
+ if (_ptr_name) {
+ NDR_PULL_ALLOC(ndr, r->name);
+ } else {
+ r->name = NULL;
+ }
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_comment));
if (_ptr_comment) {
NDR_PULL_ALLOC(ndr, r->comment);
@@ -6018,18 +6018,6 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo1(struct ndr_pull *ndr,
}
}
if (ndr_flags & NDR_BUFFERS) {
- if (r->name) {
- _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->name, 0);
- NDR_CHECK(ndr_pull_array_size(ndr, &r->name));
- NDR_CHECK(ndr_pull_array_length(ndr, &r->name));
- if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) {
- return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name));
- }
- NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint16_t)));
- NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint16_t), CH_UTF16));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
- }
if (r->description) {
_mem_save_description_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->description, 0);
@@ -6042,6 +6030,18 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo1(struct ndr_pull *ndr,
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->description, ndr_get_array_length(ndr, &r->description), sizeof(uint16_t), CH_UTF16));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_description_0, 0);
}
+ if (r->name) {
+ _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->name, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->name));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->name));
+ if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint16_t), CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
+ }
if (r->comment) {
_mem_save_comment_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->comment, 0);
@@ -6063,18 +6063,18 @@ _PUBLIC_ void ndr_print_spoolss_SetPrinterInfo1(struct ndr_print *ndr, const cha
ndr_print_struct(ndr, name, "spoolss_SetPrinterInfo1");
ndr->depth++;
ndr_print_spoolss_EnumPrinterFlags(ndr, "flags", r->flags);
- ndr_print_ptr(ndr, "name", r->name);
- ndr->depth++;
- if (r->name) {
- ndr_print_string(ndr, "name", r->name);
- }
- ndr->depth--;
ndr_print_ptr(ndr, "description", r->description);
ndr->depth++;
if (r->description) {
ndr_print_string(ndr, "description", r->description);
}
ndr->depth--;
+ ndr_print_ptr(ndr, "name", r->name);
+ ndr->depth++;
+ if (r->name) {
+ ndr_print_string(ndr, "name", r->name);
+ }
+ ndr->depth--;
ndr_print_ptr(ndr, "comment", r->comment);
ndr->depth++;
if (r->comment) {
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 8340b34..f9f34cb 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -290,8 +290,8 @@ struct spoolss_DeviceMode {
struct spoolss_PrinterInfo1 {
uint32_t flags;
- const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+ const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
}/* [gensize,public] */;
@@ -636,8 +636,8 @@ struct spoolss_SetPrinterInfo0 {
struct spoolss_SetPrinterInfo1 {
uint32_t flags;
- const char *name;/* [unique,charset(UTF16)] */
const char *description;/* [unique,charset(UTF16)] */
+ const char *name;/* [unique,charset(UTF16)] */
const char *comment;/* [unique,charset(UTF16)] */
};
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index a1bb95a..9876057 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -250,8 +250,8 @@ import "misc.idl", "security.idl", "winreg.idl";
typedef [public,gensize] struct {
spoolss_EnumPrinterFlags flags;
- [relative] nstring *name;
[relative] nstring *description;
+ [relative] nstring *name;
[relative] nstring *comment;
} spoolss_PrinterInfo1;
@@ -684,8 +684,8 @@ import "misc.idl", "security.idl", "winreg.idl";
typedef struct {
spoolss_EnumPrinterFlags flags;
- [string,charset(UTF16)] uint16 *name;
[string,charset(UTF16)] uint16 *description;
+ [string,charset(UTF16)] uint16 *name;
[string,charset(UTF16)] uint16 *comment;
} spoolss_SetPrinterInfo1;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 2bdcc3f..f2a503b 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1816,10 +1816,17 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
for (j=0;j<count;j++) {
if (r.in.level == 1) {
- /* the names appear to be comma-separated name lists? */
- char *name = talloc_strdup(tctx, info[j].info1.name);
- char *comma = strchr(name, ',');
- if (comma) *comma = 0;
+ char *unc = talloc_strdup(tctx, info[j].info1.name);
+ char *slash, *name;
+ name = unc;
+ if (unc[0] == '\\' && unc[1] == '\\') {
+ unc +=2;
+ }
+ slash = strchr(unc, '\\');
+ if (slash) {
+ slash++;
+ name = slash;
+ }
if (!test_OpenPrinter(tctx, p, name)) {
ret = false;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list