[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-970-g70d99d8

[Günther Deschner]

The branch, v3-2-test has been updated
       via  70d99d8ed92d13fa3ec308df170595316d091988 (commit)
      from  428654b473ba44b2f5340eefef0d4fcd51aff558 (commit)

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


- Log -----------------------------------------------------------------
commit 70d99d8ed92d13fa3ec308df170595316d091988
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 17 16:26:59 2008 +0200

    nbt.idl: fix parsing und pushing of dom_sids by using dom_sid0
    
    metze
    (cherry picked from commit 0e2f6d481b3e35ed392b2b3340b244c77593819c)

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

Summary of changes:
 source/librpc/idl/nbt.idl |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl
index ca764d2..e5efe17 100644
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -440,9 +440,8 @@ interface nbt
 		nstring          unicode_domain;
 		uint32           db_count;
 		nbt_db_change    dbchange[db_count];
-		[value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size;
-		[flag(NDR_ALIGN4)] DATA_BLOB _pad2;
-		dom_sid          sid;
+		[value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
+		[subcontext(0),subcontext_size(sid_size)] dom_sid0 sid;
 		uint32           nt_version;
 		uint16           lmnt_token;
 		uint16           lm20_token;
@@ -560,9 +559,8 @@ interface nbt
 		nstring              user_name;
 		astring              mailslot_name;
 		uint32               acct_control;
-		[value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size;
-		[flag(NDR_ALIGN4)]   DATA_BLOB _pad;
-		dom_sid              sid;
+		[value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
+		[subcontext(0),subcontext_size(sid_size)] dom_sid0 sid;
 		uint32               nt_version;
 		uint16               lmnt_token;
 		uint16               lm20_token;


-- 
Samba Shared Repository