From c5cd8680abe8efb8d32243f912284d925da73fa3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 27 May 2004 23:35:02 +0000 Subject: r929: Remove more unused code from util_sid.c (the old-style sid code is almost gone). (This used to be commit 82d68e8a4472906f2a2036c13a0301055740641a) --- source4/lib/util_sid.c | 153 +------------------------------------------------ 1 file changed, 1 insertion(+), 152 deletions(-) diff --git a/source4/lib/util_sid.c b/source4/lib/util_sid.c index 6eb19b59e6..cb2ec3eb75 100644 --- a/source4/lib/util_sid.c +++ b/source4/lib/util_sid.c @@ -24,75 +24,6 @@ #include "includes.h" -/**************************************************************************** - Lookup string names for SID types. -****************************************************************************/ - -static const struct { - enum SID_NAME_USE sid_type; - const char *string; -} sid_name_type[] = { - {SID_NAME_USER, "User"}, - {SID_NAME_DOM_GRP, "Domain Group"}, - {SID_NAME_DOMAIN, "Domain"}, - {SID_NAME_ALIAS, "Local Group"}, - {SID_NAME_WKN_GRP, "Well-known Group"}, - {SID_NAME_DELETED, "Deleted Account"}, - {SID_NAME_INVALID, "Invalid Account"}, - {SID_NAME_UNKNOWN, "UNKNOWN"}, - - {SID_NAME_USE_NONE, NULL} -}; - -const char *sid_type_lookup(uint32_t sid_type) -{ - int i = 0; - - /* Look through list */ - while(sid_name_type[i].sid_type != 0) { - if (sid_name_type[i].sid_type == sid_type) - return sid_name_type[i].string; - i++; - } - - /* Default return */ - return "SID *TYPE* is INVALID"; -} - -/***************************************************************** - Return the last rid from the end of a sid -*****************************************************************/ -BOOL sid_peek_rid(const struct dom_sid *sid, uint32_t *rid) -{ - if (!sid || !rid) - return False; - - if (sid->num_auths > 0) { - *rid = sid->sub_auths[sid->num_auths - 1]; - return True; - } - return False; -} - -/***************************************************************** - Return the last rid from the end of a sid - and check the sid against the exp_dom_sid -*****************************************************************/ - -BOOL sid_peek_check_rid(const struct dom_sid *exp_dom_sid, const struct dom_sid *sid, uint32_t *rid) -{ - if (!exp_dom_sid || !sid || !rid) - return False; - - - if (sid_compare_domain(exp_dom_sid, sid)!=0){ - *rid=(-1); - return False; - } - - return sid_peek_rid(sid, rid); -} - /***************************************************************** Compare the auth portion of two sids. *****************************************************************/ @@ -122,7 +53,7 @@ static int sid_compare_auth(const struct dom_sid *sid1, const struct dom_sid *si Compare two sids. *****************************************************************/ -int sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid2) +static int sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid2) { int i; @@ -144,24 +75,6 @@ int sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid2) return sid_compare_auth(sid1, sid2); } -/***************************************************************** - See if 2 SIDs are in the same domain - this just compares the leading sub-auths -*****************************************************************/ - -int sid_compare_domain(const struct dom_sid *sid1, const struct dom_sid *sid2) -{ - int n, i; - - n = MIN(sid1->num_auths, sid2->num_auths); - - for (i = n-1; i >= 0; --i) - if (sid1->sub_auths[i] != sid2->sub_auths[i]) - return sid1->sub_auths[i] - sid2->sub_auths[i]; - - return sid_compare_auth(sid1, sid2); -} - /***************************************************************** Compare two sids. *****************************************************************/ @@ -170,67 +83,3 @@ BOOL sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2) { return sid_compare(sid1, sid2) == 0; } -/***************************************************************** - Write a sid out into on-the-wire format. -*****************************************************************/ - -BOOL sid_linearize(char *outbuf, size_t len, const struct dom_sid *sid) -{ - size_t i; - - if (len < sid_size(sid)) - return False; - - SCVAL(outbuf,0,sid->sid_rev_num); - SCVAL(outbuf,1,sid->num_auths); - memcpy(&outbuf[2], sid->id_auth, 6); - for(i = 0; i < sid->num_auths; i++) - SIVAL(outbuf, 8 + (i*4), sid->sub_auths[i]); - - return True; -} - - -/***************************************************************** - Calculates size of a sid. -*****************************************************************/ - -size_t sid_size(const struct dom_sid *sid) -{ - if (sid == NULL) - return 0; - - return sid->num_auths * sizeof(uint32_t) + 8; -} - -/***************************************************************** - Return the binary string representation of a struct dom_sid. - Caller must free. -*****************************************************************/ - -char *sid_binstring(const struct dom_sid *sid) -{ - char *buf, *s; - int len = sid_size(sid); - buf = malloc(len); - if (!buf) - return NULL; - sid_linearize(buf, len, sid); - s = binary_string(buf, len); - free(buf); - return s; -} - -/******************************************************************* - Check if ACE has OBJECT type. -********************************************************************/ -BOOL sec_ace_object(uint8_t type) -{ - if (type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT || - type == SEC_ACE_TYPE_ACCESS_DENIED_OBJECT || - type == SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT || - type == SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT) { - return True; - } - return False; -} -- cgit