[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  6cb6053 s3: Fix bug 8371
      from  df616e9 s3-winbind: Add an update function for winbind cache.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 6cb605364e83fe0c5562c9b0920408c697e4fc3e
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 17 22:24:24 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.

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

Summary of changes:
 libcli/netlogon/ndr_netlogon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/netlogon/ndr_netlogon.c b/libcli/netlogon/ndr_netlogon.c
index 7d6aa97..81dbed4 100644
--- a/libcli/netlogon/ndr_netlogon.c
+++ b/libcli/netlogon/ndr_netlogon.c
@@ -53,6 +53,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;
@@ -98,6 +99,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