diff options
| author | Günther Deschner <gd@samba.org> | 2009-02-18 16:10:40 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-02-18 16:10:40 +0100 |
| commit | e9bfc0ab512338c43030f70b4aaa94598157deaf (patch) | |
| tree | 779ef670fbf9033dc989286ae04e4f3bc0ea9b14 | |
| parent | 6c91a83e941ff4ef4b1d8e18118f8fa3860c6134 (diff) | |
| download | samba-e9bfc0ab512338c43030f70b4aaa94598157deaf.tar.gz samba-e9bfc0ab512338c43030f70b4aaa94598157deaf.tar.bz2 samba-e9bfc0ab512338c43030f70b4aaa94598157deaf.zip | |
s3: re-run make samba3-idl.
Guenther
| -rw-r--r-- | librpc/gen_ndr/ndr_spoolss.c | 25 | ||||
| -rw-r--r-- | librpc/gen_ndr/spoolss.h | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index 1230343cb6..8ab2290e74 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -12545,11 +12545,13 @@ _PUBLIC_ void ndr_print_spoolss_PortData1(struct ndr_print *ndr, const char *nam _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorUi(struct ndr_push *ndr, int ndr_flags, const struct spoolss_MonitorUi *r) { if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dll_name, CH_UTF16))); - NDR_CHECK(ndr_push_align(ndr, 2)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dll_name, CH_UTF16))); - NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->dll_name, ndr_charset_length(r->dll_name, CH_UTF16), sizeof(uint16_t), CH_UTF16)); + NDR_CHECK(ndr_push_align(ndr, 4)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dll_name)); + ndr->flags = _flags_save_string; + } } if (ndr_flags & NDR_BUFFERS) { } @@ -12559,14 +12561,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorUi(struct ndr_push *ndr, int _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorUi(struct ndr_pull *ndr, int ndr_flags, struct spoolss_MonitorUi *r) { if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_array_size(ndr, &r->dll_name)); - NDR_CHECK(ndr_pull_align(ndr, 2)); - NDR_CHECK(ndr_pull_array_length(ndr, &r->dll_name)); - if (ndr_get_array_length(ndr, &r->dll_name) > ndr_get_array_size(ndr, &r->dll_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->dll_name), ndr_get_array_length(ndr, &r->dll_name)); + NDR_CHECK(ndr_pull_align(ndr, 4)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->dll_name)); + ndr->flags = _flags_save_string; } - NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->dll_name), sizeof(uint16_t))); - NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->dll_name, ndr_get_array_length(ndr, &r->dll_name), sizeof(uint16_t), CH_UTF16)); } if (ndr_flags & NDR_BUFFERS) { } diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index 0e6cf0bc10..9c74969a5a 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -1170,7 +1170,7 @@ struct spoolss_PortData1 { }/* [public] */; struct spoolss_MonitorUi { - const char *dll_name;/* [charset(UTF16)] */ + const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ }/* [public] */; /* bitmap spoolss_AddPrinterDriverExFlags */ |