Cleanup bogus initialisation in SID_NAME_USE enum.

Added new sid type = 9 for "computer" from MSDN.
(This used to be commit 45929d126932e5cac5a23fe76d28a4fa05b54b77)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index bf2d5631a739ec5bf575b43feee7270382cab947..0506c410f3b143fe86820c98e496e2ae4fb4b67d 100644 (file)
--- 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 81d17ae3f2dffe4fdd8b315833548dfc32dfd5ae..dfd3b312e062e460ec18618d87430a642ef0505a 100644 (file)
--- 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)