[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-543-g6d68161

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  6d68161e676d381600c77c3f862bd7e013968724 (commit)
       via  3c5bae2249d01213ff4bd7df2b4e3ac04da4a52d (commit)
      from  be5eb2da241452ccc0526f4f115aa44c0793c351 (commit)

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


- Log -----------------------------------------------------------------
commit 6d68161e676d381600c77c3f862bd7e013968724
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jan 24 10:24:41 2008 +0100

    netlogon.idl: make use of bitmap samr_GroupAttrs
    
    metze

commit 3c5bae2249d01213ff4bd7df2b4e3ac04da4a52d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jan 24 10:22:45 2008 +0100

    netlogon.idl: remove unused netr_GroupsMembership structure
    
    We have samr_RidWithAttribute and use that in all cases.
    
    metze

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

Summary of changes:
 source/auth/auth_sam_reply.c   |    2 +-
 source/librpc/idl/netlogon.idl |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_sam_reply.c b/source/auth/auth_sam_reply.c
index 6ab2204..ea6f0a1 100644
--- a/source/auth/auth_sam_reply.c
+++ b/source/auth/auth_sam_reply.c
@@ -132,7 +132,7 @@ NTSTATUS auth_convert_server_info_saminfo3(TALLOC_CTX *mem_ctx,
 			continue;
 		}
 		sam3->sids[sam3->sidcount].sid = talloc_reference(sam3->sids,server_info->domain_groups[i]);
-		sam3->sids[sam3->sidcount].attribute = 
+		sam3->sids[sam3->sidcount].attributes =
 			SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED;
 		sam3->sidcount += 1;
 	}
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index dcbb647..63e7aaf 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -19,6 +19,7 @@ import "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
 interface netlogon
 {
 	typedef bitmap samr_AcctFlags samr_AcctFlags;
+	typedef bitmap samr_GroupAttrs samr_GroupAttrs;
 
 	/*****************/
 	/* Function 0x00 */
@@ -126,11 +127,6 @@ interface netlogon
 		[case(6)] netr_NetworkInfo  *network;
 	} netr_LogonLevel;
 
-	typedef [public] struct {
-		uint32 rid;
-		uint32 attributes;
-	} netr_GroupMembership;
-
 	typedef [public,flag(NDR_PAHEX)] struct {
 		uint8 key[16];
 	} netr_UserSessionKey;
@@ -187,7 +183,7 @@ interface netlogon
 
 	typedef struct {
 		dom_sid2 *sid;
-		uint32 attribute;
+		samr_GroupAttrs attributes;
 	} netr_SidAttr;
 
 	typedef [public] struct {


-- 
Samba Shared Repository