diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-01-06 13:34:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:28 -0500 |
| commit | 1ec6416a35ff560fff37ca3e7881152d0a7d6158 (patch) | |
| tree | 40f5cf40ac3815c5bf3fcf39d90f8120f6ad6fbf | |
| parent | 5db389cbdc606be3f66766dd80a0b7ecf10d7a2d (diff) | |
| download | samba-1ec6416a35ff560fff37ca3e7881152d0a7d6158.tar.gz samba-1ec6416a35ff560fff37ca3e7881152d0a7d6158.tar.bz2 samba-1ec6416a35ff560fff37ca3e7881152d0a7d6158.zip | |
r4568: make use of SidType and move it to lsa.idl
metze
(This used to be commit c2523adc0a0807979fb21b8ba77d556bac82e435)
| -rw-r--r-- | source4/dsdb/common/flag_mapping.c | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/lsa.idl | 25 | ||||
| -rw-r--r-- | source4/librpc/idl/samr.idl | 12 |
3 files changed, 19 insertions, 20 deletions
diff --git a/source4/dsdb/common/flag_mapping.c b/source4/dsdb/common/flag_mapping.c index 30c5b0cf13..8fdded98f5 100644 --- a/source4/dsdb/common/flag_mapping.c +++ b/source4/dsdb/common/flag_mapping.c @@ -119,7 +119,7 @@ uint32_t samdb_gtype2atype(uint32_t gtype) } /* 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: diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl index cb3457de89..84aa0145a1 100644 --- a/source4/librpc/idl/lsa.idl +++ b/source4/librpc/idl/lsa.idl @@ -290,9 +290,20 @@ /******************/ /* Function: 0x0e */ - - typedef struct { - uint16 sid_type; + 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 { + 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; diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index 4e12369d7c..41414b1abe 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -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; |