svn commit: samba r4568 - in branches/SAMBA_4_0/source: dsdb/common librpc/idl

metze at samba.org metze at samba.org
Thu Jan 6 13:34:18 GMT 2005


Author: metze
Date: 2005-01-06 13:34:18 +0000 (Thu, 06 Jan 2005)
New Revision: 4568

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4568

Log:
make use of SidType and move it to lsa.idl

metze

Modified:
   branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
   branches/SAMBA_4_0/source/librpc/idl/lsa.idl
   branches/SAMBA_4_0/source/librpc/idl/samr.idl


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2005-01-06 12:22:20 UTC (rev 4567)
+++ branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2005-01-06 13:34:18 UTC (rev 4568)
@@ -119,7 +119,7 @@
 }
 
 /* turn a sAMAccountType into a SID_NAME_USE */
-enum samr_SidType samdb_atype_map(uint32_t atype)
+enum lsa_SidType samdb_atype_map(uint32_t atype)
 {
 	switch (atype & 0xF0000000) {
 	case ATYPE_GLOBAL_GROUP:

Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl	2005-01-06 12:22:20 UTC (rev 4567)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl	2005-01-06 13:34:18 UTC (rev 4568)
@@ -290,9 +290,20 @@
 
 	/******************/
 	/* Function: 0x0e */
+	typedef enum {
+		SID_NAME_USE_NONE = 0,/* NOTUSED */
+		SID_NAME_USER    = 1, /* user */
+		SID_NAME_DOM_GRP = 2, /* domain group */
+		SID_NAME_DOMAIN  = 3, /* domain: don't know what this is */
+		SID_NAME_ALIAS   = 4, /* local group */
+		SID_NAME_WKN_GRP = 5, /* well-known group */
+		SID_NAME_DELETED = 6, /* deleted account: needed for c2 rating */
+		SID_NAME_INVALID = 7, /* invalid account */
+		SID_NAME_UNKNOWN = 8  /* oops. */
+	} lsa_SidType;
 
 	typedef struct {
-		uint16 sid_type;
+		lsa_SidType sid_type;
 		uint32 rid;
 		uint32 sid_index;
 	} lsa_TranslatedSid;
@@ -323,7 +334,7 @@
 	/* Function: 0x0f */
 
 	typedef struct {
-		uint16 sid_type;
+		lsa_SidType sid_type;
 		lsa_String name;
 		uint32 sid_index;
 	} lsa_TranslatedName;
@@ -719,7 +730,7 @@
 	/* Function 0x39 */
 
 	typedef struct {
-		uint16 sid_type;
+		lsa_SidType sid_type;
 		lsa_String name;
 		uint32 sid_index;
 		uint32 unknown;
@@ -745,7 +756,7 @@
 	/* Function 0x3a */
 
 	typedef struct {
-		uint16 sid_type;
+		lsa_SidType sid_type;
 		uint32 rid;
 		uint32 sid_index;
 		uint32 unknown;
@@ -798,7 +809,7 @@
 	/**********************/
 	/* Function 0x44 */
 	typedef struct {
-		uint16 sid_type;
+		lsa_SidType sid_type;
 		dom_sid2 *sid;
 		uint32 sid_index;
 		uint32 unknown;

Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-01-06 12:22:20 UTC (rev 4567)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-01-06 13:34:18 UTC (rev 4568)
@@ -301,18 +301,6 @@
 	/************************/
 	/* Function    0x10     */
 
-	typedef enum {
-		SID_NAME_USE_NONE = 0,/* NOTUSED */
-		SID_NAME_USER    = 1, /* user */
-		SID_NAME_DOM_GRP = 2, /* domain group */
-		SID_NAME_DOMAIN  = 3, /* domain: don't know what this is */
-		SID_NAME_ALIAS   = 4, /* local group */
-		SID_NAME_WKN_GRP = 5, /* well-known group */
-		SID_NAME_DELETED = 6, /* deleted account: needed for c2 rating */
-		SID_NAME_INVALID = 7, /* invalid account */
-		SID_NAME_UNKNOWN = 8  /* oops. */
-	} samr_SidType;
-
 	typedef struct {
 		[range(0,1024)]  uint32 count;
 		[size_is(count)] uint32 *ids;



More information about the samba-cvs mailing list