make sid_binstring available without HAVE_ADS
[ira/wip.git] / source3 / lib / util_sid.c
index 295fd0efacb56f37c7a924cf4d26f60a18849145..72365f5e46d866c04cbaddfbb6f91cbc3fd30083 100644 (file)
@@ -3,6 +3,8 @@
    Version 1.9.
    Samba utility functions
    Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Luke Kenneth Caseson Leighton 1998-1999
+   Copyright (C) Jeremy Allison  1999
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 
+DOM_SID global_sam_sid;
+extern pstring global_myname;
+extern fstring global_myworkgroup;
+
+/*
+ * Some useful sids
+ */
+
+DOM_SID global_sid_Builtin;                            /* Local well-known domain */
+DOM_SID global_sid_World_Domain;               /* Everyone domain */
+DOM_SID global_sid_World;                              /* Everyone */
+DOM_SID global_sid_Creator_Owner_Domain;    /* Creator Owner domain */
+DOM_SID global_sid_Creator_Owner;              /* Creator Owner */
+DOM_SID global_sid_NT_Authority;               /* NT Authority */
+DOM_SID global_sid_NULL;                       /* NULL sid */
+DOM_SID global_sid_Builtin_Guests;                     /* Builtin guest users */
+DOM_SID global_sid_Authenticated_Users;                /* All authenticated rids */
+DOM_SID global_sid_Network;                                    /* Network rids */
+DOM_SID global_sid_Anonymous;                          /* Anonymous login */
+
+const DOM_SID *global_sid_everyone = &global_sid_World;
+
+typedef struct _known_sid_users {
+       uint32 rid;
+       enum SID_NAME_USE sid_name_use;
+       char *known_user_name;
+} known_sid_users;
+
+/* static known_sid_users no_users[] = {{0, 0, NULL}}; */
+
+static known_sid_users everyone_users[] = {
+       { 0, SID_NAME_WKN_GRP, "Everyone" },
+       {0, (enum SID_NAME_USE)0, NULL}};
+
+static known_sid_users creator_owner_users[] = {
+       { 0, SID_NAME_ALIAS, "Creator Owner" },
+       {0, (enum SID_NAME_USE)0, NULL}};
+
+static known_sid_users nt_authority_users[] = {
+       {  1, SID_NAME_ALIAS, "Dialup" },
+       {  2, SID_NAME_ALIAS, "Network"},
+       {  3, SID_NAME_ALIAS, "Batch"},
+       {  4, SID_NAME_ALIAS, "Interactive"},
+       {  6, SID_NAME_ALIAS, "Service"},
+       {  7, SID_NAME_ALIAS, "AnonymousLogon"},
+       {  8, SID_NAME_ALIAS, "Proxy"},
+       {  9, SID_NAME_ALIAS, "ServerLogon"},
+       { 11, SID_NAME_ALIAS, "Authenticated Users"},
+       { 18, SID_NAME_ALIAS, "SYSTEM"},
+       {  0, (enum SID_NAME_USE)0, NULL}};
+
+static known_sid_users builtin_groups[] = {
+       { BUILTIN_ALIAS_RID_ADMINS, SID_NAME_ALIAS, "Administrators" },
+       { BUILTIN_ALIAS_RID_USERS, SID_NAME_ALIAS, "Users" },
+       { BUILTIN_ALIAS_RID_GUESTS, SID_NAME_ALIAS, "Guests" },
+       { BUILTIN_ALIAS_RID_ACCOUNT_OPS, SID_NAME_ALIAS, "Account Operators" },
+       { BUILTIN_ALIAS_RID_SYSTEM_OPS, SID_NAME_ALIAS, "Server Operators" },
+       { BUILTIN_ALIAS_RID_PRINT_OPS, SID_NAME_ALIAS, "Print Operators" },
+       { BUILTIN_ALIAS_RID_BACKUP_OPS, SID_NAME_ALIAS, "Backup Operators" },
+       {  0, (enum SID_NAME_USE)0, NULL}};
+
+#define MAX_SID_NAMES  7
+
+static struct sid_name_map_info
+{
+       DOM_SID *sid;
+       char *name;
+       known_sid_users *known_users;
+} sid_name_map[MAX_SID_NAMES];
+
+static BOOL sid_name_map_initialized = False;
+
+/*
+ * An NT compatible anonymous token.
+ */
+
+static DOM_SID anon_sid_array[3];
+
+NT_USER_TOKEN anonymous_token = {
+    3,
+    anon_sid_array
+};
+
+/**************************************************************************
+ quick init function
+ *************************************************************************/
+static void init_sid_name_map (void)
+{
+       int i = 0;
+       
+       if (sid_name_map_initialized) return;
+       
+
+       if ((lp_security() == SEC_USER) && lp_domain_logons()) {
+               sid_name_map[i].sid = &global_sam_sid;
+               sid_name_map[i].name = global_myworkgroup;
+               sid_name_map[i].known_users = NULL;
+               i++;
+               sid_name_map[i].sid = &global_sam_sid;
+               sid_name_map[i].name = global_myname;
+               sid_name_map[i].known_users = NULL;
+               i++;
+       }
+       else {
+               sid_name_map[i].sid = &global_sam_sid;
+               sid_name_map[i].name = global_myname;
+               sid_name_map[i].known_users = NULL;
+               i++;
+       }
+
+       sid_name_map[i].sid = &global_sid_Builtin;
+       sid_name_map[i].name = "BUILTIN";
+       sid_name_map[i].known_users = &builtin_groups[0];
+       i++;
+       
+       sid_name_map[i].sid = &global_sid_World_Domain;
+       sid_name_map[i].name = "";
+       sid_name_map[i].known_users = &everyone_users[0];
+       i++;
+
+       sid_name_map[i].sid = &global_sid_Creator_Owner_Domain;
+       sid_name_map[i].name = "";
+       sid_name_map[i].known_users = &creator_owner_users[0];
+       i++;
+               
+       sid_name_map[i].sid = &global_sid_NT_Authority;
+       sid_name_map[i].name = "NT Authority";
+       sid_name_map[i].known_users = &nt_authority_users[0];
+       i++;
+               
+
+       /* end of array */
+       sid_name_map[i].sid = NULL;
+       sid_name_map[i].name = NULL;
+       sid_name_map[i].known_users = NULL;
+       
+       sid_name_map_initialized = True;
+               
+       return;
+
+}
+
+/****************************************************************************
+ Creates some useful well known sids
+****************************************************************************/
+
+void generate_wellknown_sids(void)
+{
+       string_to_sid(&global_sid_Builtin, "S-1-5-32");
+       string_to_sid(&global_sid_Builtin_Guests, "S-1-5-32-546");
+       string_to_sid(&global_sid_World_Domain, "S-1-1");
+       string_to_sid(&global_sid_World, "S-1-1-0");
+       string_to_sid(&global_sid_Creator_Owner_Domain, "S-1-3");
+       string_to_sid(&global_sid_Creator_Owner, "S-1-3-0");
+       string_to_sid(&global_sid_NT_Authority, "S-1-5");
+       string_to_sid(&global_sid_NULL, "S-1-0-0");
+       string_to_sid(&global_sid_Authenticated_Users, "S-1-5-11");
+       string_to_sid(&global_sid_Network, "S-1-5-2");
+       string_to_sid(&global_sid_Anonymous, "S-1-5-7");
+
+       /* Create the anon token. */
+       sid_copy( &anonymous_token.user_sids[0], &global_sid_World);
+       sid_copy( &anonymous_token.user_sids[1], &global_sid_Network);
+       sid_copy( &anonymous_token.user_sids[2], &global_sid_Anonymous);
+}
+
+/**************************************************************************
+ Turns a domain SID into a name, returned in the nt_domain argument.
+***************************************************************************/
+
+BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain)
+{
+       fstring sid_str;
+       int i = 0;
+       
+       sid_to_string(sid_str, sid);
+
+       if (!sid_name_map_initialized) 
+               init_sid_name_map();
+
+       DEBUG(5,("map_domain_sid_to_name: %s\n", sid_str));
+
+       if (nt_domain == NULL)
+               return False;
+
+       while (sid_name_map[i].sid != NULL) {
+               sid_to_string(sid_str, sid_name_map[i].sid);
+               DEBUG(5,("map_domain_sid_to_name: compare: %s\n", sid_str));
+               if (sid_equal(sid_name_map[i].sid, sid)) {              
+                       fstrcpy(nt_domain, sid_name_map[i].name);
+                       DEBUG(5,("map_domain_sid_to_name: found '%s'\n", nt_domain));
+                       return True;
+               }
+               i++;
+       }
+
+       DEBUG(5,("map_domain_sid_to_name: mapping for %s not found\n", sid_str));
+
+    return False;
+}
+
+/**************************************************************************
+ Looks up a known username from one of the known domains.
+***************************************************************************/
+
+BOOL lookup_known_rid(DOM_SID *sid, uint32 rid, char *name, enum SID_NAME_USE *psid_name_use)
+{
+       int i = 0;
+       struct sid_name_map_info *psnm;
+
+       if (!sid_name_map_initialized) 
+               init_sid_name_map();
+
+       for(i = 0; sid_name_map[i].sid != NULL; i++) {
+               psnm = &sid_name_map[i];
+               if(sid_equal(psnm->sid, sid)) {
+                       int j;
+                       for(j = 0; psnm->known_users && psnm->known_users[j].known_user_name != NULL; j++) {
+                               if(rid == psnm->known_users[j].rid) {
+                                       DEBUG(5,("lookup_builtin_rid: rid = %u, domain = '%s', user = '%s'\n",
+                                               (unsigned int)rid, psnm->name, psnm->known_users[j].known_user_name ));
+                                       fstrcpy( name, psnm->known_users[j].known_user_name);
+                                       *psid_name_use = psnm->known_users[j].sid_name_use;
+                                       return True;
+                               }
+                       }
+               }
+       }
+
+       return False;
+}
+
+/**************************************************************************
+ Turns a domain name into a SID.
+ *** side-effect: if the domain name is NULL, it is set to our domain ***
+***************************************************************************/
+
+BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain)
+{
+       int i = 0;
+
+       if (nt_domain == NULL) {
+               DEBUG(5,("map_domain_name_to_sid: mapping NULL domain to our SID.\n"));
+               sid_copy(sid, &global_sam_sid);
+               return True;
+       }
+
+       if (nt_domain[0] == 0) {
+               fstrcpy(nt_domain, global_myname);
+               DEBUG(5,("map_domain_name_to_sid: overriding blank name to %s\n", nt_domain));
+               sid_copy(sid, &global_sam_sid);
+               return True;
+       }
 
-extern int DEBUGLEVEL;
+       DEBUG(5,("map_domain_name_to_sid: %s\n", nt_domain));
 
+       if (!sid_name_map_initialized) 
+               init_sid_name_map();
+
+       while (sid_name_map[i].name != NULL) {
+               DEBUG(5,("map_domain_name_to_sid: compare: %s\n", sid_name_map[i].name));
+               if (strequal(sid_name_map[i].name, nt_domain)) {
+                       fstring sid_str;
+                       sid_copy(sid, sid_name_map[i].sid);
+                       sid_to_string(sid_str, sid_name_map[i].sid);
+                       DEBUG(5,("map_domain_name_to_sid: found %s\n", sid_str));
+                       return True;
+               }
+               i++;
+       }
+
+       DEBUG(0,("map_domain_name_to_sid: mapping to %s not found.\n", nt_domain));
+       return False;
+}
+
+/**************************************************************************
+ Splits a name of format \DOMAIN\name or name into its two components.
+ Sets the DOMAIN name to global_myname if it has not been specified.
+***************************************************************************/
+
+void split_domain_name(const char *fullname, char *domain, char *name)
+{
+       pstring full_name;
+       char *p, *sep;
+
+       sep = lp_winbind_separator();
+
+       *domain = *name = '\0';
+
+       if (fullname[0] == sep[0] || fullname[0] == '\\')
+               fullname++;
+
+       pstrcpy(full_name, fullname);
+       p = strchr_m(full_name+1, '\\');
+       if (!p) p = strchr_m(full_name+1, sep[0]);
+
+       if (p != NULL) {
+               *p = 0;
+               fstrcpy(domain, full_name);
+               fstrcpy(name, p+1);
+       } else {
+               fstrcpy(domain, global_myname);
+               fstrcpy(name, full_name);
+       }
+
+       DEBUG(10,("split_domain_name:name '%s' split into domain :'%s' and user :'%s'\n",
+                       fullname, domain, name));
+}
 
 /*****************************************************************
  Convert a SID to an ascii string.
 *****************************************************************/
 
-char *sid_to_string(pstring sidstr_out, const DOM_SID *sid)
+char *sid_to_string(fstring sidstr_out, DOM_SID *sid)
 {
   char subauth[16];
   int i;
@@ -39,15 +346,13 @@ char *sid_to_string(pstring sidstr_out, const DOM_SID *sid)
               (sid->id_auth[3] << 16) +
               (sid->id_auth[2] << 24);
 
-  slprintf(sidstr_out, sizeof(pstring) - 1, "S-%u-%lu", (unsigned int)sid->sid_rev_num, (unsigned long)ia);
+  slprintf(sidstr_out, sizeof(fstring) - 1, "S-%u-%lu", (unsigned int)sid->sid_rev_num, (unsigned long)ia);
 
-  for (i = 0; i < sid->num_auths; i++)
-  {
+  for (i = 0; i < sid->num_auths; i++) {
     slprintf(subauth, sizeof(subauth)-1, "-%lu", (unsigned long)sid->sub_auths[i]);
-    pstrcat(sidstr_out, subauth);
+    fstrcat(sidstr_out, subauth);
   }
 
-  DEBUG(7,("sid_to_string returning %s\n", sidstr_out));
   return sidstr_out;
 }
 
@@ -55,72 +360,66 @@ char *sid_to_string(pstring sidstr_out, const DOM_SID *sid)
  Convert a string to a SID. Returns True on success, False on fail.
 *****************************************************************/  
    
-BOOL string_to_sid(DOM_SID *sidout, const char *sidstr)
+BOOL string_to_sid(DOM_SID *sidout, char *sidstr)
 {
-       const char *p = sidstr;
-       /* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
-       uint32 ia;
-
-       memset((char *)sidout, '\0', sizeof(DOM_SID));
+  pstring tok;
+  char *p = sidstr;
+  /* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
+  uint32 ia;
 
-       if (StrnCaseCmp( sidstr, "S-", 2))
-       {
-               DEBUG(0,("string_to_sid: Sid %s does not start with 'S-'.\n", sidstr));
-               return False;
-       }
+  memset((char *)sidout, '\0', sizeof(DOM_SID));
 
-       if ((p = strchr(p, '-')) == NULL)
-       {
-               DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
-               return False;
-       }
+  if (StrnCaseCmp( sidstr, "S-", 2)) {
+    DEBUG(0,("string_to_sid: Sid %s does not start with 'S-'.\n", sidstr));
+    return False;
+  }
 
-       p++;
+  p += 2;
+  if (!next_token(&p, tok, "-", sizeof(tok))) {
+    DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
+    return False;
+  }
 
-       /* Get the revision number. */
-       sidout->sid_rev_num = (uint8)strtoul(p,NULL,10);
+  /* Get the revision number. */
+  sidout->sid_rev_num = (uint8)strtoul(tok, NULL, 10);
 
-       if ((p = strchr(p, '-')) == NULL)
-       {
-               DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
-               return False;
-       }
+  if (!next_token(&p, tok, "-", sizeof(tok))) {
+    DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
+    return False;
+  }
 
-       p++;
-
-       /* identauth in decimal should be <  2^32 */
-       ia = (uint32)strtoul(p,NULL,10);
-
-       /* NOTE - the ia value is in big-endian format. */
-       sidout->id_auth[0] = 0;
-       sidout->id_auth[1] = 0;
-       sidout->id_auth[2] = (ia & 0xff000000) >> 24;
-       sidout->id_auth[3] = (ia & 0x00ff0000) >> 16;
-       sidout->id_auth[4] = (ia & 0x0000ff00) >> 8;
-       sidout->id_auth[5] = (ia & 0x000000ff);
-
-       sidout->num_auths = 0;
-
-       while (((p = strchr(p, '-')) != NULL) && sidout->num_auths < MAXSUBAUTHS)
-       {
-               p++;
-               /*
-                * NOTE - the subauths are in native machine-endian format. They
-                * are converted to little-endian when linearized onto the wire.
-                */
-               sid_append_rid(sidout, (uint32)strtoul(p, NULL, 10));
-       }
+  /* identauth in decimal should be <  2^32 */
+  ia = (uint32)strtoul(tok, NULL, 10);
+
+  /* NOTE - the ia value is in big-endian format. */
+  sidout->id_auth[0] = 0;
+  sidout->id_auth[1] = 0;
+  sidout->id_auth[2] = (ia & 0xff000000) >> 24;
+  sidout->id_auth[3] = (ia & 0x00ff0000) >> 16;
+  sidout->id_auth[4] = (ia & 0x0000ff00) >> 8;
+  sidout->id_auth[5] = (ia & 0x000000ff);
+
+  sidout->num_auths = 0;
+
+  while(next_token(&p, tok, "-", sizeof(tok)) && 
+       sidout->num_auths < MAXSUBAUTHS) {
+    /* 
+     * NOTE - the subauths are in native machine-endian format. They
+     * are converted to little-endian when linearized onto the wire.
+     */
+       sid_append_rid(sidout, (uint32)strtoul(tok, NULL, 10));
+  }
 
-       return True;
+  return True;
 }
 
 /*****************************************************************
add a rid to the end of a sid
Add a rid to the end of a sid
 *****************************************************************/  
+
 BOOL sid_append_rid(DOM_SID *sid, uint32 rid)
 {
-       if (sid->num_auths < MAXSUBAUTHS)
-       {
+       if (sid->num_auths < MAXSUBAUTHS) {
                sid->sub_auths[sid->num_auths++] = rid;
                return True;
        }
@@ -128,120 +427,256 @@ BOOL sid_append_rid(DOM_SID *sid, uint32 rid)
 }
 
 /*****************************************************************
removes the last rid from the end of a sid
Removes the last rid from the end of a sid
 *****************************************************************/  
+
 BOOL sid_split_rid(DOM_SID *sid, uint32 *rid)
 {
-       if (sid->num_auths > 0)
-       {
+       if (sid->num_auths > 0) {
                sid->num_auths--;
-               if (rid != NULL)
-               {
-                       (*rid) = sid->sub_auths[sid->num_auths];
-               }
+               *rid = sid->sub_auths[sid->num_auths];
                return True;
        }
        return False;
 }
 
 /*****************************************************************
copies a sid
Return the last rid from the end of a sid
 *****************************************************************/  
-void sid_copy(DOM_SID *sid1, const DOM_SID *sid2)
+
+BOOL sid_peek_rid(DOM_SID *sid, uint32 *rid)
+{
+       if (sid->num_auths > 0) {
+               *rid = sid->sub_auths[sid->num_auths - 1];
+               return True;
+       }
+       return False;
+}
+
+/*****************************************************************
+ Copies a sid
+*****************************************************************/  
+
+void sid_copy(DOM_SID *dst, const DOM_SID *src)
 {
        int i;
 
-       for (i = 0; i < 6; i++)
-       {
-               sid1->id_auth[i] = sid2->id_auth[i];
-       }
+       memset((char *)dst, '\0', sizeof(DOM_SID));
 
-       for (i = 0; i < sid2->num_auths; i++)
-       {
-               sid1->sub_auths[i] = sid2->sub_auths[i];
-       }
+       dst->sid_rev_num = src->sid_rev_num;
+       dst->num_auths = src->num_auths;
+
+       memcpy(&dst->id_auth[0], &src->id_auth[0], sizeof(src->id_auth));
+
+       for (i = 0; i < src->num_auths; i++)
+               dst->sub_auths[i] = src->sub_auths[i];
+}
+
+/*****************************************************************
+ Duplicates a sid - mallocs the target.
+*****************************************************************/
+
+DOM_SID *sid_dup(DOM_SID *src)
+{
+  DOM_SID *dst;
+
+  if(!src)
+    return NULL;
+
+  if((dst = malloc(sizeof(DOM_SID))) != NULL) {
+       memset(dst, '\0', sizeof(DOM_SID));
+       sid_copy( dst, src);
+  }
 
-       sid1->num_auths   = sid2->num_auths;
-       sid1->sid_rev_num = sid2->sid_rev_num;
+  return dst;
 }
 
 /*****************************************************************
- compare two sids up to the auths of the first sid
+ Write a sid out into on-the-wire format.
 *****************************************************************/  
-BOOL sid_front_equal(const DOM_SID *sid1, const DOM_SID *sid2)
+BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid)
 {
-       int i;
+       size_t i;
 
-       /* compare most likely different rids, first: i.e start at end */
-       for (i = sid1->num_auths-1; i >= 0; --i)
-       {
-               if (sid1->sub_auths[i] != sid2->sub_auths[i]) return False;
+       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;
+}
+
+/*****************************************************************
+ parse a on-the-wire SID to a DOM_SID
+*****************************************************************/  
+BOOL sid_parse(char *inbuf, size_t len, DOM_SID *sid)
+{
+       int i;
+       if (len < 8) return False;
+       sid->sid_rev_num = CVAL(inbuf, 0);
+       sid->num_auths = CVAL(inbuf, 1);
+       memcpy(sid->id_auth, inbuf+2, 6);
+       if (len < 8 + sid->num_auths*4) return False;
+       for (i=0;i<sid->num_auths;i++) {
+               sid->sub_auths[i] = IVAL(inbuf, 8+i*4);
        }
+       return True;
+}
+
+
+/*****************************************************************
+ Compare the domain portion of two sids.
+*****************************************************************/  
+int sid_compare_domain(const DOM_SID *sid1, const DOM_SID *sid2)
+{
+       int i;
+
+       if (sid1 == sid2) return 0;
+       if (!sid1) return -1;
+       if (!sid2) return 1;
 
-       if (sid1->num_auths   >  sid2->num_auths  ) return False;
-       if (sid1->sid_rev_num != sid2->sid_rev_num) return False;
+       if (sid1->sid_rev_num != sid2->sid_rev_num)
+               return sid1->sid_rev_num - sid2->sid_rev_num;
 
        for (i = 0; i < 6; i++)
-       {
-               if (sid1->id_auth[i] != sid2->id_auth[i]) return False;
-       }
+               if (sid1->id_auth[i] != sid2->id_auth[i])
+                       return sid1->id_auth[i] - sid2->id_auth[i];
 
-       return True;
+       return 0;
 }
 
 /*****************************************************************
- compare two sids
+ Compare two sids.
 *****************************************************************/  
-BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2)
+int sid_compare(const DOM_SID *sid1, const DOM_SID *sid2)
 {
        int i;
 
+       if (sid1 == sid2) return 0;
+       if (!sid1) return -1;
+       if (!sid2) return 1;
+
        /* compare most likely different rids, first: i.e start at end */
+       if (sid1->num_auths != sid2->num_auths)
+               return sid1->num_auths - sid2->num_auths;
+
        for (i = sid1->num_auths-1; i >= 0; --i)
-       {
-               if (sid1->sub_auths[i] != sid2->sub_auths[i]) return False;
-       }
+               if (sid1->sub_auths[i] != sid2->sub_auths[i])
+                       return sid1->sub_auths[i] - sid2->sub_auths[i];
 
-       if (sid1->num_auths   != sid2->num_auths  ) return False;
-       if (sid1->sid_rev_num != sid2->sid_rev_num) return False;
+       return sid_compare_domain(sid1, sid2);
+}
 
-       for (i = 0; i < 6; i++)
-       {
-               if (sid1->id_auth[i] != sid2->id_auth[i]) return False;
-       }
 
-       return True;
+/*****************************************************************
+ Compare two sids.
+*****************************************************************/  
+BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2)
+{
+       return sid_compare(sid1, sid2) == 0;
+}
+
+
+/*****************************************************************
+ Check if the SID is our domain SID (S-1-5-21-x-y-z).
+*****************************************************************/  
+BOOL sid_check_is_domain(const DOM_SID *sid)
+{
+       return sid_equal(sid, &global_sam_sid);
+}
+
+
+/*****************************************************************
+ Check if the SID is the builtin SID (S-1-5-32).
+*****************************************************************/  
+BOOL sid_check_is_builtin(const DOM_SID *sid)
+{
+       return sid_equal(sid, &global_sid_Builtin);
 }
 
 
 /*****************************************************************
- calculates size of a sid
+ Check if the SID is our domain SID (S-1-5-21-x-y-z).
+*****************************************************************/  
+BOOL sid_check_is_in_our_domain(const DOM_SID *sid)
+{
+       DOM_SID dom_sid;
+       uint32 rid;
+
+       sid_copy(&dom_sid, sid);
+       sid_split_rid(&dom_sid, &rid);
+       
+       return sid_equal(&dom_sid, &global_sam_sid);
+}
+
+/*****************************************************************
+ Check if the SID is our domain SID (S-1-5-21-x-y-z).
 *****************************************************************/  
-int sid_size(const DOM_SID *sid)
+BOOL sid_check_is_in_builtin(const DOM_SID *sid)
+{
+       DOM_SID dom_sid;
+       uint32 rid;
+
+       sid_copy(&dom_sid, sid);
+       sid_split_rid(&dom_sid, &rid);
+       
+       return sid_equal(&dom_sid, &global_sid_Builtin);
+}
+
+
+/*****************************************************************
+ Calculates size of a sid.
+*****************************************************************/  
+
+size_t sid_size(DOM_SID *sid)
 {
        if (sid == NULL)
-       {
                return 0;
-       }
+
        return sid->num_auths * sizeof(uint32) + 8;
 }
 
-
 /*****************************************************************
Duplicates a sid - mallocs the target.
Returns true if SID is internal (and non-mappable).
 *****************************************************************/
 
-DOM_SID *sid_dup(const DOM_SID *src)
+BOOL non_mappable_sid(DOM_SID *sid)
 {
-  DOM_SID *dst;
+       DOM_SID dom;
+       uint32 rid;
 
-  if(!src)
-    return NULL;
+       sid_copy(&dom, sid);
+       sid_split_rid(&dom, &rid);
 
-  if((dst = (DOM_SID*)malloc(sizeof(DOM_SID))) != NULL) {
-       memset(dst, '\0', sizeof(DOM_SID));
-       sid_copy( dst, src);
-  }
+       if (sid_equal(&dom, &global_sid_Builtin))
+               return True;
 
-  return dst;
+       if (sid_equal(&dom, &global_sid_Creator_Owner_Domain))
+               return True;
+       if (sid_equal(&dom, &global_sid_NT_Authority))
+               return True;
+
+       return False;
 }
+
+/*
+  return the binary string representation of a DOM_SID
+  caller must free
+*/
+char *sid_binstring(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;
+}
+