summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-14 02:26:41 +0000
committerTim Potter <tpot@samba.org>2003-04-14 02:26:41 +0000
commit886d4e6fe2b4fc4a2c06014abdc2d796936bbcac (patch)
tree21d3912b77603c0aa0119b4d3373c7cc0c6f0b16
parente8a0a3d357d2aa714df44a57f2dd5103d8e1d02c (diff)
downloadsamba-886d4e6fe2b4fc4a2c06014abdc2d796936bbcac.tar.gz
samba-886d4e6fe2b4fc4a2c06014abdc2d796936bbcac.tar.bz2
samba-886d4e6fe2b4fc4a2c06014abdc2d796936bbcac.zip
Merge of new sid type (SID_NAME_COMPUTER) and tidyup.
(This used to be commit c91cf2b38df9f51dd6cb46f0742e1c57bb36b508)
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/lib/util_sid.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f6c60644be..75bc44d978 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -240,7 +240,6 @@ 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 */
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 824987f189..9e5ae6b441 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)