diff options
| author | Tim Potter <tpot@samba.org> | 2003-03-20 00:32:44 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-03-20 00:32:44 +0000 |
| commit | 2f13a74671c62a2861979ce2ab33ad1363bdbcf7 (patch) | |
| tree | 70d56bfe0269add41c47decfac059d53f48407eb | |
| parent | c775678250003ef2d9b3db4895a6654dd513b203 (diff) | |
| download | samba-2f13a74671c62a2861979ce2ab33ad1363bdbcf7.tar.gz samba-2f13a74671c62a2861979ce2ab33ad1363bdbcf7.tar.bz2 samba-2f13a74671c62a2861979ce2ab33ad1363bdbcf7.zip | |
Cleanup bogus initialisation in SID_NAME_USE enum.
Added new sid type = 9 for "computer" from MSDN.
(This used to be commit 45929d126932e5cac5a23fe76d28a4fa05b54b77)
| -rw-r--r-- | source3/include/smb.h | 16 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index bf2d5631a7..0506c410f3 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -236,15 +236,15 @@ typedef struct nttime_info /* 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. */ + 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 */ }; /** diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 81d17ae3f2..dfd3b312e0 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -91,8 +91,9 @@ static const struct { {SID_NAME_DELETED, "Deleted Account"}, {SID_NAME_INVALID, "Invalid Account"}, {SID_NAME_UNKNOWN, "UNKNOWN"}, + {SID_NAME_COMPUTER, "Computer"}, - {SID_NAME_USE_NONE, NULL} + {0, NULL} }; const char *sid_type_lookup(uint32 sid_type) |