diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-05-07 23:55:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:47 -0500 |
commit | 2fdf5d332d0a3c7a12fe4d7fdc0155dd7a45adc3 (patch) | |
tree | b1edcda8be17acb07bce98c2ae3afb517a4a5eb1 | |
parent | 265023fafa463c742f89510879acb2a830de8ab9 (diff) | |
download | samba-2fdf5d332d0a3c7a12fe4d7fdc0155dd7a45adc3.tar.gz samba-2fdf5d332d0a3c7a12fe4d7fdc0155dd7a45adc3.tar.bz2 samba-2fdf5d332d0a3c7a12fe4d7fdc0155dd7a45adc3.zip |
r575: moved the SID_NAME_USE enum into samr.idl
(This used to be commit 2cb06b39d91ef18b21c18e9376ccbd8076aeecf8)
-rw-r--r-- | source4/include/smb.h | 15 | ||||
-rw-r--r-- | source4/librpc/idl/samr.idl | 12 |
2 files changed, 14 insertions, 13 deletions
diff --git a/source4/include/smb.h b/source4/include/smb.h index 7c86511b34..6e87e158b2 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -255,19 +255,8 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN]; #define MAXSUBAUTHS 15 /* max sub authorities in a SID */ #endif -/* SID Types */ -enum SID_NAME_USE -{ - 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. */ -}; +/* for compatibility */ +#define SID_NAME_USE samr_SidType /** * @brief Security Identifier diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index c3dd05fd2d..eceaf784ec 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -294,6 +294,18 @@ /************************/ /* 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 { uint32 count; [size_is(count)] uint32 *ids; |