Attachment 7117 Details for Bug 8371 – Patch for 3.6

[patch] Patch for 3.6

8371.patch (text/plain), 1.46 KB, created by Volker Lendecke on 2011-11-18 09:46:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2011-11-18 09:46:06 UTC

Size: 1.46 KB

patch

obsolete

>From 511705b4d0d084fb8bd584d12d584ca6a0ddca9e Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 17 Nov 2011 22:24:24 +0100
>Subject: [PATCH] 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.
>---
> libcli/netlogon/ndr_netlogon.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>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;
>-- 
>1.7.0.4
>

Flags:

metze: review+

Actions: View

Attachments on bug 8371: 6775 | 6780 | 6781 | 6782 | 6828 | 6835 | 6836 | 6837 | 6839 | 6840 | 7095 | 7096 | 7097 | 7098 | 7099 | 7102 | 7109 | 7110 | 7114 | 7115 | 7117 | 7118 | 7124