From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 6 Feb 2013 15:44:20 +0000 (+0100)
Subject: Revert "fit it"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=71d93b9685af038eb704f31ae2a3d11449818692;hp=6680f9f7422cef4c2c99257f7b2ea83b057ccfe8;p=metze%2Fsamba%2Fwip.git

Revert "fit it"

This reverts commit 55f55ebd1437be75595a0b0637012f0630907d69.
---

diff --git a/librpc/idl/krb5pac.idl b/librpc/idl/krb5pac.idl
index f6e984a389c1..8a6540c13b1e 100644
--- a/librpc/idl/krb5pac.idl
+++ b/librpc/idl/krb5pac.idl
@@ -89,7 +89,7 @@ interface krb5pac
 	typedef [public,nopush,nopull,noprint] struct {
 		PAC_TYPE type;
 		[value(_ndr_size_PAC_INFO(info, type, 0))] uint32 _ndr_size;
-		[relative,switch_is(type),subcontext(0),subcontext_size(NDR_ROUND(_ndr_size,8)),flag(NDR_ALIGN8)] PAC_INFO *info;
+		[relative,switch_is(type),subcontext(0),subcontext_size(_subcontext_size_PAC_INFO(r, ndr->flags)),flag(NDR_ALIGN8)] PAC_INFO *info;
 		[value(0)] uint32 _pad; /* Top half of a 64 bit pointer? */
 	} PAC_BUFFER;
 
diff --git a/librpc/ndr/ndr_krb5pac.c b/librpc/ndr/ndr_krb5pac.c
index 96352c837724..f7db79110762 100644
--- a/librpc/ndr/ndr_krb5pac.c
+++ b/librpc/ndr/ndr_krb5pac.c
@@ -34,6 +34,12 @@ static size_t _ndr_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, int fl
 	}
 }
 
+static size_t _subcontext_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, int flags)
+{
+	size_t s = ndr_size_PAC_INFO(r, level, flags);
+	return NDR_ROUND(s,8);
+}
+
 enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const struct PAC_BUFFER *r)
 {
 	if (ndr_flags & NDR_SCALARS) {
@@ -56,10 +62,10 @@ enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const
 				NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->info));
 				{
 					struct ndr_push *_ndr_info;
-					NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info, 0, NDR_ROUND(r->_ndr_size, 8)));
+					NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,0)));
 					NDR_CHECK(ndr_push_set_switch_value(_ndr_info, r->info, r->type));
 					NDR_CHECK(ndr_push_PAC_INFO(_ndr_info, NDR_SCALARS|NDR_BUFFERS, r->info));
-					NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, NDR_ROUND(r->_ndr_size, 8)));
+					NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,0)));
 				}
 				NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->info));
 			}
@@ -103,10 +109,10 @@ enum ndr_err_code ndr_pull_PAC_BUFFER(struct ndr_pull *ndr, int ndr_flags, struc
 				NDR_PULL_SET_MEM_CTX(ndr, r->info, 0);
 				{
 					struct ndr_pull *_ndr_info;
-					NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_info, 0, NDR_ROUND(r->_ndr_size, 8)));
+					NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_info, 0, r->_ndr_size));
 					NDR_CHECK(ndr_pull_set_switch_value(_ndr_info, r->info, r->type));
 					NDR_CHECK(ndr_pull_PAC_INFO(_ndr_info, NDR_SCALARS|NDR_BUFFERS, r->info));
-					NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_info, 0, NDR_ROUND(r->_ndr_size, 8)));
+					NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_info, 0, r->_ndr_size));
 				}
 				NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
 				if (ndr->offset > ndr->relative_highest_offset) {