diff options
| author | Gerald Carter <jerry@samba.org> | 2006-09-08 14:28:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:51:18 -0500 |
| commit | 2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66 (patch) | |
| tree | 75f48eabc8ea83e437bbeb5df541c8162b75d09f /source3/include/smb.h | |
| parent | c2d59d817021b8faacbb035d8d7dd727bc14344c (diff) | |
| download | samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.tar.gz samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.tar.bz2 samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.zip | |
r18271: Big change:
* autogenerate lsa ndr code
* rename 'enum SID_NAME_USE' to 'enum lsa_SidType'
* merge a log more security descriptor functions from
gen_ndr/ndr_security.c in SAMBA_4_0
The most embarassing thing is the "#define strlen_m strlen"
We need a real implementation in SAMBA_3_0 which I'll work on
after this code is in.
(This used to be commit 3da9f80c28b1e75ef6d46d38fbb81ade6b9fa951)
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 6bc8680f86..eb8ec93f7e 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -248,20 +248,6 @@ typedef uint64_t NTTIME; #define SID_MAX_SIZE ((size_t)(8+(MAXSUBAUTHS*4))) -/* SID Types */ -enum SID_NAME_USE { - SID_NAME_USE_NONE = 0, - SID_NAME_USER = 1, /* user */ - SID_NAME_DOM_GRP, /* domain group */ - SID_NAME_DOMAIN, /* domain sid */ - SID_NAME_ALIAS, /* local group */ - SID_NAME_WKN_GRP, /* well-known group */ - SID_NAME_DELETED, /* deleted account: needed for c2 rating */ - SID_NAME_INVALID, /* invalid account */ - SID_NAME_UNKNOWN, /* unknown sid type */ - SID_NAME_COMPUTER /* sid for a computer */ -}; - #define LOOKUP_NAME_ISOLATED 1 /* Look up unqualified names */ #define LOOKUP_NAME_REMOTE 2 /* Ask others */ #define LOOKUP_NAME_ALL (LOOKUP_NAME_ISOLATED|LOOKUP_NAME_REMOTE) @@ -287,8 +273,14 @@ typedef struct dom_sid { uint32 sub_auths[MAXSUBAUTHS]; } DOM_SID; +#define dom_sid2 dom_sid +#define dom_sid28 dom_sid + #include "librpc/ndr/misc.h" #include "librpc/ndr/security.h" +#include "librpc/ndr/libndr.h" +#include "librpc/gen_ndr/unixinfo.h" +#include "librpc/gen_ndr/lsa.h" struct lsa_dom_info { BOOL valid; @@ -300,7 +292,7 @@ struct lsa_dom_info { struct lsa_name_info { uint32 rid; - enum SID_NAME_USE type; + enum lsa_SidType type; const char *name; int dom_idx; }; |