[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Mar 2 06:10:02 MST 2011
The branch, master has been updated
via 7101f5a librpc/idl: remove unused string defines from idl_types.h
via 56df34a librpc/rpc: let ndr_pull_spoolss_EnumPrinterDataEx() use a subcontext
from ea29261 s3-sessionid: avoid global include of sessionid.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7101f5a8f21875519942d0263efa3221fc23bb22
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 1 16:44:22 2011 +0100
librpc/idl: remove unused string defines from idl_types.h
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Mar 2 14:09:44 CET 2011 on sn-devel-104
commit 56df34a6aa336c1f7e6b40a4cc585ae12d9052a6
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 1 17:41:27 2011 +0100
librpc/rpc: let ndr_pull_spoolss_EnumPrinterDataEx() use a subcontext
This is not strictly needed, but it's good to have the logic
in common with the other Enum* calls.
This also allows us to play with the NDR_RELATIVE_REVERSE flag.
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/idl_types.h | 23 -----------------------
librpc/ndr/ndr_spoolss_buf.c | 5 ++++-
2 files changed, 4 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h
index 88ece20..023c040 100644
--- a/librpc/idl/idl_types.h
+++ b/librpc/idl/idl_types.h
@@ -15,29 +15,6 @@
#define nstring [flag(STR_NULLTERM|NDR_ALIGN2)] string
/*
- an ascii string prefixed with [offset] [length], both 32 bits
- null terminated
-*/
-#define ascstr2 [flag(STR_ASCII|STR_LEN4)] string
-
-/*
- an ascii string prefixed with [size], 32 bits
-*/
-#define asclstr [flag(STR_ASCII|STR_SIZE4)] string
-
-/*
- an ascii string prefixed with [size], 16 bits
- null terminated
-*/
-#define ascstr3 [flag(STR_ASCII|STR_SIZE2)] string
-
-/*
- an ascii string prefixed with [size] [offset] [length], all 32 bits
- not null terminated
-*/
-#define ascstr_noterm [flag(STR_NOTERM|STR_ASCII|STR_SIZE4|STR_LEN4)] string
-
-/*
a null terminated ascii string
*/
#define astring [flag(STR_ASCII|STR_NULLTERM)] string
diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index d1e4b41..14fb222 100644
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -480,13 +480,16 @@ enum ndr_err_code ndr_push_spoolss_EnumPrinterDataEx(struct ndr_push *ndr, int f
_r.out.result = r->out.result;
_r.out.info = data_blob(NULL, 0);
if (r->in.offered >= *r->out.needed) {
+ struct ndr_push *_subndr_info;
struct __spoolss_EnumPrinterDataEx __r;
_ndr_info = ndr_push_init_ctx(ndr);
NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
_ndr_info->flags= ndr->flags;
__r.in.count = *r->out.count;
__r.out.info = *r->out.info;
- NDR_CHECK(ndr_push___spoolss_EnumPrinterDataEx(_ndr_info, flags, &__r));
+ NDR_CHECK(ndr_push_subcontext_start(_ndr_info, &_subndr_info, 0, r->in.offered));
+ NDR_CHECK(ndr_push___spoolss_EnumPrinterDataEx(_subndr_info, flags, &__r));
+ NDR_CHECK(ndr_push_subcontext_end(_ndr_info, _subndr_info, 0, r->in.offered));
if (r->in.offered > _ndr_info->offset) {
uint32_t _padding_len = r->in.offered - _ndr_info->offset;
NDR_CHECK(ndr_push_zero(_ndr_info, _padding_len));
--
Samba Shared Repository
More information about the samba-cvs
mailing list