[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  2642f38 s3: Fix bug 8371
      from  cd3f552 s3-py-passdb: Fix handling of uninitialized gid values

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2642f385887fbd3aecd4286a4d6223a21d981714
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 17 22:36:22 2011 +0100

    s3: Fix bug 8371
    
    ndr_set_flag or's in the given flag (ALIGN4). At this point, ndr->flags
    contains NOALIGN, which will persist. In ndr_push_DATA_BLOB NOALIGN overrides
    everything else, so that the ALIGN4 is not respected.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Nov 18 09:33:37 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 librpc/ndr/ndr_nbt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_nbt.c b/librpc/ndr/ndr_nbt.c
index f2a1ca3..29013f0 100644
--- a/librpc/ndr/ndr_nbt.c
+++ b/librpc/ndr/ndr_nbt.c
@@ -234,6 +234,7 @@ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int
 		if (ndr_size_dom_sid0(&r->sid, ndr->flags)) {
 			struct ndr_push *_ndr_sid;
 			uint32_t _flags_save_DATA_BLOB = ndr->flags;
+			ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
 			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
 			NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_pad));
 			ndr->flags = _flags_save_DATA_BLOB;
@@ -279,6 +280,7 @@ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int
 		if (r->sid_size) {
 			uint32_t _flags_save_DATA_BLOB = ndr->flags;
 			struct ndr_pull *_ndr_sid;
+			ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
 			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
 			NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
 			ndr->flags = _flags_save_DATA_BLOB;


-- 
Samba Shared Repository