Replace nt_user_token with server_info in connection_struct
[jra/samba/.git] / source3 / smbd / uid.c
index e2cc26e0aec5db798c3bfb8889fd8893f700b1e3..8a4a54f86725b4420902c70e4cd072628d840ba4 100644 (file)
@@ -2,20 +2,19 @@
    Unix SMB/CIFS implementation.
    uid/user handling
    Copyright (C) Andrew Tridgell 1992-1998
-   
+
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,78 +26,123 @@ extern struct current_user current_user;
  Become the guest user without changing the security context stack.
 ****************************************************************************/
 
-BOOL change_to_guest(void)
+bool change_to_guest(void)
 {
        static struct passwd *pass=NULL;
 
        if (!pass) {
                /* Don't need to free() this as its stored in a static */
-               pass = getpwnam_alloc(lp_guestaccount());
+               pass = getpwnam_alloc(NULL, lp_guestaccount());
                if (!pass)
                        return(False);
        }
-       
+
 #ifdef AIX
        /* MWW: From AIX FAQ patch to WU-ftpd: call initgroups before 
           setting IDs */
        initgroups(pass->pw_name, pass->pw_gid);
 #endif
-       
+
        set_sec_ctx(pass->pw_uid, pass->pw_gid, 0, NULL, NULL);
-       
+
        current_user.conn = NULL;
        current_user.vuid = UID_FIELD_INVALID;
-       
-       passwd_free(&pass);
+
+       TALLOC_FREE(pass);
+       pass = NULL;
 
        return True;
 }
 
 /*******************************************************************
  Check if a username is OK.
+
+ This sets up conn->server_info with a copy related to this vuser that
+ later code can then mess with.
 ********************************************************************/
 
-static BOOL check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
+static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
 {
-       int i;
-       for (i=0;i<conn->vuid_cache.entries && i< VUID_CACHE_SIZE;i++)
-               if (conn->vuid_cache.list[i] == vuser->vuid)
+       unsigned int i;
+       struct vuid_cache_entry *ent = NULL;
+       bool readonly_share;
+
+       for (i=0; i<VUID_CACHE_SIZE; i++) {
+               ent = &conn->vuid_cache.array[i];
+               if (ent->vuid == vuser->vuid) {
+                       conn->server_info = ent->server_info;
+                       conn->read_only = ent->read_only;
+                       conn->admin_user = ent->admin_user;
                        return(True);
-
-       if ((conn->force_user || conn->force_group) 
-           && (conn->vuid != vuser->vuid)) {
-               return False;
+               }
        }
-       
-       if (!user_ok(vuser->user.unix_name,snum))
+
+       if (!user_ok_token(vuser->server_info->unix_name,
+                          vuser->server_info->ptok,
+                          snum))
                return(False);
 
-       if (!share_access_check(conn, snum, vuser, conn->read_only ? FILE_READ_DATA : FILE_WRITE_DATA)) {
+       readonly_share = is_share_read_only_for_token(
+               vuser->server_info->unix_name, vuser->server_info->ptok,
+               SNUM(conn));
+
+       if (!readonly_share &&
+           !share_access_check(vuser->server_info->ptok, lp_servicename(snum),
+                               FILE_WRITE_DATA)) {
+               /* smb.conf allows r/w, but the security descriptor denies
+                * write. Fall back to looking at readonly. */
+               readonly_share = True;
+               DEBUG(5,("falling back to read-only access-evaluation due to "
+                        "security descriptor\n"));
+       }
+
+       if (!share_access_check(vuser->server_info->ptok, lp_servicename(snum),
+                               readonly_share ?
+                               FILE_READ_DATA : FILE_WRITE_DATA)) {
                return False;
        }
 
-       i = conn->vuid_cache.entries % VUID_CACHE_SIZE;
-       conn->vuid_cache.list[i] = vuser->vuid;
+       ent = &conn->vuid_cache.array[conn->vuid_cache.next_entry];
+
+       conn->vuid_cache.next_entry =
+               (conn->vuid_cache.next_entry + 1) % VUID_CACHE_SIZE;
+
+       TALLOC_FREE(ent->server_info);
+
+       ent->server_info = copy_serverinfo(conn, vuser->server_info);
+       if (ent->server_info == NULL) {
+               ent->vuid = UID_FIELD_INVALID;
+               return false;
+       }
+
+       ent->vuid = vuser->vuid;
+       ent->read_only = readonly_share;
 
-       conn->vuid_cache.entries++;
+       ent->admin_user = token_contains_name_in_list(
+               vuser->server_info->unix_name, NULL, vuser->server_info->ptok,
+               lp_admin_users(SNUM(conn)));
+
+       conn->read_only = ent->read_only;
+       conn->admin_user = ent->admin_user;
+       conn->server_info = ent->server_info;
 
        return(True);
 }
 
 /****************************************************************************
  Become the user of a connection number without changing the security context
- stack, but modify the currnet_user entries.
+ stack, but modify the current_user entries.
 ****************************************************************************/
 
-BOOL change_to_user(connection_struct *conn, uint16 vuid)
+bool change_to_user(connection_struct *conn, uint16 vuid)
 {
        user_struct *vuser = get_valid_user_struct(vuid);
        int snum;
        gid_t gid;
        uid_t uid;
        char group_c;
-       BOOL must_free_token = False;
-       NT_USER_TOKEN *token = NULL;
+       int num_groups = 0;
+       gid_t *group_list = NULL;
 
        if (!conn) {
                DEBUG(2,("change_to_user: Connection not open\n"));
@@ -113,32 +157,47 @@ BOOL change_to_user(connection_struct *conn, uint16 vuid)
         */
 
        if((lp_security() == SEC_SHARE) && (current_user.conn == conn) &&
-          (current_user.uid == conn->uid)) {
-               DEBUG(4,("change_to_user: Skipping user change - already user\n"));
+          (current_user.ut.uid == conn->uid)) {
+               DEBUG(4,("change_to_user: Skipping user change - already "
+                        "user\n"));
                return(True);
        } else if ((current_user.conn == conn) && 
                   (vuser != 0) && (current_user.vuid == vuid) && 
-                  (current_user.uid == vuser->uid)) {
-               DEBUG(4,("change_to_user: Skipping user change - already user\n"));
+                  (current_user.ut.uid == vuser->server_info->uid)) {
+               DEBUG(4,("change_to_user: Skipping user change - already "
+                        "user\n"));
                return(True);
        }
 
        snum = SNUM(conn);
 
+       if ((vuser) && !check_user_ok(conn, vuser, snum)) {
+               DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) "
+                        "not permitted access to share %s.\n",
+                        vuser->server_info->sanitized_username,
+                        vuser->server_info->unix_name, vuid,
+                        lp_servicename(snum)));
+               return False;
+       }
+
+       /*
+        * conn->server_info is now correctly set up with a copy we can mess
+        * with for force_group etc.
+        */
+
        if (conn->force_user) /* security = share sets this too */ {
                uid = conn->uid;
                gid = conn->gid;
-               current_user.groups = conn->groups;
-               current_user.ngroups = conn->ngroups;
-               token = conn->nt_user_token;
-       } else if ((vuser) && check_user_ok(conn, vuser, snum)) {
-               uid = vuser->uid;
-               gid = vuser->gid;
-               current_user.ngroups = vuser->n_groups;
-               current_user.groups  = vuser->groups;
-               token = vuser->nt_user_token;
+               group_list = conn->groups;
+               num_groups = conn->ngroups;
+       } else if (vuser) {
+               uid = conn->admin_user ? 0 : vuser->server_info->uid;
+               gid = conn->server_info->gid;
+               num_groups = conn->server_info->n_groups;
+               group_list  = conn->server_info->groups;
        } else {
-               DEBUG(2,("change_to_user: Invalid vuid used %d or vuid not permitted access to share.\n",vuid));
+               DEBUG(2,("change_to_user: Invalid vuid used %d in accessing "
+                        "share %s.\n",vuid, lp_servicename(snum) ));
                return False;
        }
 
@@ -149,7 +208,6 @@ BOOL change_to_user(connection_struct *conn, uint16 vuid)
         */
 
        if((group_c = *lp_force_group(snum))) {
-               BOOL is_guest = False;
 
                if(group_c == '+') {
 
@@ -161,47 +219,36 @@ BOOL change_to_user(connection_struct *conn, uint16 vuid)
                         */
 
                        int i;
-                       for (i = 0; i < current_user.ngroups; i++) {
-                               if (current_user.groups[i] == conn->gid) {
+                       for (i = 0; i < num_groups; i++) {
+                               if (group_list[i] == conn->gid) {
                                        gid = conn->gid;
+                                       gid_to_sid(&conn->server_info->ptok
+                                                  ->user_sids[1], gid);
                                        break;
                                }
                        }
                } else {
                        gid = conn->gid;
+                       gid_to_sid(&conn->server_info->ptok->user_sids[1],
+                                  gid);
                }
-
-               /*
-                * We've changed the group list in the token - we must
-                * re-create it.
-                */
-
-               if (vuser && vuser->guest)
-                       is_guest = True;
-
-               token = create_nt_token(uid, gid, current_user.ngroups, current_user.groups, is_guest);
-               if (!token) {
-                       DEBUG(1, ("change_to_user: create_nt_token failed!\n"));
-                       return False;
-               }
-               must_free_token = True;
        }
-       
-       set_sec_ctx(uid, gid, current_user.ngroups, current_user.groups, token);
 
-       /*
-        * Free the new token (as set_sec_ctx copies it).
-        */
+       /* Now set current_user since we will immediately also call
+          set_sec_ctx() */
 
-       if (must_free_token)
-               delete_nt_token(&token);
+       current_user.ut.ngroups = num_groups;
+       current_user.ut.groups  = group_list;   
+
+       set_sec_ctx(uid, gid, current_user.ut.ngroups, current_user.ut.groups,
+                   conn->server_info->ptok);
 
        current_user.conn = conn;
        current_user.vuid = vuid;
 
        DEBUG(5,("change_to_user uid=(%d,%d) gid=(%d,%d)\n",
                 (int)getuid(),(int)geteuid(),(int)getgid(),(int)getegid()));
-  
+
        return(True);
 }
 
@@ -210,7 +257,7 @@ BOOL change_to_user(connection_struct *conn, uint16 vuid)
  but modify the current_user entries.
 ****************************************************************************/
 
-BOOL change_to_root_user(void)
+bool change_to_root_user(void)
 {
        set_root_sec_ctx();
 
@@ -229,13 +276,14 @@ BOOL change_to_root_user(void)
  user. Doesn't modify current_user.
 ****************************************************************************/
 
-BOOL become_authenticated_pipe_user(pipes_struct *p)
+bool become_authenticated_pipe_user(pipes_struct *p)
 {
        if (!push_sec_ctx())
                return False;
 
-       set_sec_ctx(p->pipe_user.uid, p->pipe_user.gid, 
-                   p->pipe_user.ngroups, p->pipe_user.groups, p->pipe_user.nt_user_token);
+       set_sec_ctx(p->pipe_user.ut.uid, p->pipe_user.ut.gid, 
+                   p->pipe_user.ut.ngroups, p->pipe_user.ut.groups,
+                   p->pipe_user.nt_user_token);
 
        return True;
 }
@@ -247,7 +295,7 @@ BOOL become_authenticated_pipe_user(pipes_struct *p)
  current_user.
 ****************************************************************************/
 
-BOOL unbecome_authenticated_pipe_user(void)
+bool unbecome_authenticated_pipe_user(void)
 {
        return pop_sec_ctx();
 }
@@ -260,29 +308,29 @@ struct conn_ctx {
        connection_struct *conn;
        uint16 vuid;
 };
+
 /* A stack of current_user connection contexts. */
+
 static struct conn_ctx conn_ctx_stack[MAX_SEC_CTX_DEPTH];
 static int conn_ctx_stack_ndx;
 
 static void push_conn_ctx(void)
 {
        struct conn_ctx *ctx_p;
+
        /* Check we don't overflow our stack */
+
        if (conn_ctx_stack_ndx == MAX_SEC_CTX_DEPTH) {
                DEBUG(0, ("Connection context stack overflow!\n"));
                smb_panic("Connection context stack overflow!\n");
        }
+
        /* Store previous user context */
        ctx_p = &conn_ctx_stack[conn_ctx_stack_ndx];
+
        ctx_p->conn = current_user.conn;
        ctx_p->vuid = current_user.vuid;
+
        DEBUG(3, ("push_conn_ctx(%u) : conn_ctx_stack_ndx = %d\n",
                (unsigned int)ctx_p->vuid, conn_ctx_stack_ndx ));
 
@@ -292,7 +340,7 @@ static void push_conn_ctx(void)
 static void pop_conn_ctx(void)
 {
        struct conn_ctx *ctx_p;
+
        /* Check for stack underflow. */
 
        if (conn_ctx_stack_ndx == 0) {
@@ -310,17 +358,6 @@ static void pop_conn_ctx(void)
        ctx_p->vuid = UID_FIELD_INVALID;
 }
 
-void init_conn_ctx(void)
-{
-    int i;
-    /* Initialise connection context stack */
-       for (i = 0; i < MAX_SEC_CTX_DEPTH; i++) {
-               conn_ctx_stack[i].conn = NULL;
-               conn_ctx_stack[i].vuid = UID_FIELD_INVALID;
-    }
-}
-
 /****************************************************************************
  Temporarily become a root user.  Must match with unbecome_root(). Saves and
  restores the connection context.
@@ -328,7 +365,13 @@ void init_conn_ctx(void)
 
 void become_root(void)
 {
-       push_sec_ctx();
+        /*
+         * no good way to handle push_sec_ctx() failing without changing
+         * the prototype of become_root()
+         */
+       if (!push_sec_ctx()) {
+               smb_panic("become_root: push_sec_ctx failed");
+       }
        push_conn_ctx();
        set_root_sec_ctx();
 }
@@ -346,7 +389,7 @@ void unbecome_root(void)
  Saves and restores the connection context.
 ****************************************************************************/
 
-BOOL become_user(connection_struct *conn, uint16 vuid)
+bool become_user(connection_struct *conn, uint16 vuid)
 {
        if (!push_sec_ctx())
                return False;
@@ -362,373 +405,9 @@ BOOL become_user(connection_struct *conn, uint16 vuid)
        return True;
 }
 
-BOOL unbecome_user(void)
+bool unbecome_user(void)
 {
        pop_sec_ctx();
        pop_conn_ctx();
        return True;
 }
-
-/*****************************************************************
- Convert the suplimentary SIDs returned in a netlogon into UNIX
- group gid_t's. Add to the total group array.
-*****************************************************************/
-void add_supplementary_nt_login_groups(int *n_groups, gid_t **pp_groups, NT_USER_TOKEN **pptok)
-{
-       int total_groups;
-       int current_n_groups = *n_groups;
-       gid_t *final_groups = NULL;
-       size_t i;
-       NT_USER_TOKEN *ptok = *pptok;
-       NT_USER_TOKEN *new_tok = NULL;
-       if (!ptok || (ptok->num_sids == 0))
-               return;
-
-       new_tok = dup_nt_token(ptok);
-       if (!new_tok) {
-               DEBUG(0,("add_supplementary_nt_login_groups: Failed to malloc new token\n"));
-               return;
-       }
-       /* Leave the allocated space but empty the number of SIDs. */
-       new_tok->num_sids = 0;
-
-       total_groups = current_n_groups + ptok->num_sids;
-       final_groups = (gid_t *)malloc(total_groups * sizeof(gid_t));
-       if (!final_groups) {
-               DEBUG(0,("add_supplementary_nt_login_groups: Failed to malloc new groups.\n"));
-               delete_nt_token(&new_tok);
-               return;
-       }
-       memcpy(final_groups, *pp_groups, current_n_groups * sizeof(gid_t));
-       for (i = 0; i < ptok->num_sids; i++) {
-               enum SID_NAME_USE sid_type;
-               gid_t new_grp;
-               if (sid_to_gid(&ptok->user_sids[i], &new_grp, &sid_type)) {
-                       /*
-                        * Don't add the gid_t if it is already in the current group
-                        * list. Some UNIXen don't like the same group more than once.
-                        */
-                       int j;
-
-                       for (j = 0; j < current_n_groups; j++)
-                               if (final_groups[j] == new_grp)
-                                       break;
-               
-                       if ( j == current_n_groups) {
-                               /* Group not already present. */
-                               final_groups[current_n_groups++] = new_grp;
-                       }
-               } else {
-                       /* SID didn't map. Copy to the new token to be saved. */
-                       sid_copy(&new_tok->user_sids[new_tok->num_sids++], &ptok->user_sids[i]);
-               }
-       }
-       SAFE_FREE(*pp_groups);
-       *pp_groups = final_groups;
-       *n_groups = current_n_groups;
-
-       /* Replace the old token with the truncated one. */
-       delete_nt_token(&ptok);
-       *pptok = new_tok;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert name to SID function.
- Tries local lookup first - for local domains - then uses winbind.
-*****************************************************************/  
-
-BOOL lookup_name(const char *domain, const char *name, DOM_SID *psid, enum SID_NAME_USE *name_type)
-{
-       fstring sid;
-       BOOL local_lookup = False;
-       
-       *name_type = SID_NAME_UNKNOWN;
-
-       /* If we are looking up a domain user, make sure it is
-          for the local machine only */
-       
-       if (strequal(global_myname(), domain)) {
-               local_lookup = True;
-       } else if (lp_server_role() == ROLE_DOMAIN_PDC || 
-                  lp_server_role() == ROLE_DOMAIN_BDC) {
-               if (strequal(domain, lp_workgroup())) {
-                       local_lookup = True;
-               }
-       }
-               
-       if (local_lookup) {
-               if (local_lookup_name(name, psid, name_type)) {
-                       DEBUG(10,
-                             ("lookup_name: (local) [%s]\\[%s] -> SID %s (type %s: %u)\n",
-                              domain, name, sid_to_string(sid,psid),
-                              sid_type_lookup(*name_type), (unsigned int)*name_type));
-                       return True;
-               }
-       } else {
-               /* Remote */
-               if (winbind_lookup_name(domain, name, psid, name_type)) {
-                       
-                       DEBUG(10,("lookup_name (winbindd): [%s]\\[%s] -> SID %s (type %u)\n",
-                                 domain, name, sid_to_string(sid, psid), 
-                                 (unsigned int)*name_type));
-                       return True;
-               }
-       }
-       
-       DEBUG(10, ("lookup_name: %s lookup for [%s]\\[%s] failed\n", 
-                  local_lookup ? "local" : "winbind", domain, name));
-
-       return False;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert SID to name function.
- Tries local lookup first - for local sids, then tries winbind.
-*****************************************************************/  
-
-BOOL lookup_sid(DOM_SID *sid, fstring dom_name, fstring name, enum SID_NAME_USE *name_type)
-{
-       if (!name_type)
-               return False;
-
-       *name_type = SID_NAME_UNKNOWN;
-
-       /* Check if this is our own sid.  This should perhaps be done by
-          winbind?  For the moment handle it here. */
-
-       if (sid->num_auths == 5) {
-               DOM_SID tmp_sid;
-               uint32 rid;
-
-               sid_copy(&tmp_sid, sid);
-               sid_split_rid(&tmp_sid, &rid);
-
-               if (sid_equal(get_global_sam_sid(), &tmp_sid)) {
-
-                       return map_domain_sid_to_name(&tmp_sid, dom_name) &&
-                               local_lookup_sid(sid, name, name_type);
-               }
-       }
-
-       if (!winbind_lookup_sid(sid, dom_name, name, name_type)) {
-               fstring sid_str;
-               DOM_SID tmp_sid;
-               uint32 rid;
-
-               DEBUG(10,("lookup_sid: winbind lookup for SID %s failed - trying local.\n", sid_to_string(sid_str, sid) ));
-
-               sid_copy(&tmp_sid, sid);
-               sid_split_rid(&tmp_sid, &rid);
-               return map_domain_sid_to_name(&tmp_sid, dom_name) &&
-                       lookup_known_rid(&tmp_sid, rid, name, name_type);
-       }
-       return True;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert uid_t to SID function.
- Tries winbind first - then uses local lookup.
- Returns SID pointer.
-*****************************************************************/  
-
-DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
-{
-       uid_t low, high;
-       fstring sid;
-
-       if (lp_winbind_uid(&low, &high) && uid >= low && uid <= high) {
-               if (winbind_uid_to_sid(psid, uid)) {
-
-                       DEBUG(10,("uid_to_sid: winbindd %u -> %s\n",
-                               (unsigned int)uid, sid_to_string(sid, psid)));
-
-                       return psid;
-               }
-       }
-       
-       /* Make sure we report failure, (when psid == NULL) */
-       become_root();
-       psid = local_uid_to_sid(psid, uid);
-        unbecome_root();
-
-       DEBUG(10,("uid_to_sid: local %u -> %s\n", (unsigned int)uid, sid_to_string(sid, psid)));
-
-       return psid;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert gid_t to SID function.
- Tries winbind first - then uses local lookup.
- Returns SID pointer.
-*****************************************************************/  
-
-DOM_SID *gid_to_sid(DOM_SID *psid, gid_t gid)
-{
-       gid_t low, high;
-       fstring sid;
-
-       if (lp_winbind_gid(&low, &high) && gid >= low && gid <= high) {
-               if (winbind_gid_to_sid(psid, gid)) {
-
-                       DEBUG(10,("gid_to_sid: winbindd %u -> %s\n",
-                               (unsigned int)gid, sid_to_string(sid, psid)));
-                        
-                       return psid;
-               }
-       }
-
-       /* Make sure we report failure, (when psid == NULL) */
-       psid = local_gid_to_sid(psid, gid);
-        
-       DEBUG(10,("gid_to_sid: local %u -> %s\n", (unsigned int)gid, sid_to_string(sid, psid)));
-
-       return psid;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert SID to uid function.
- Tries winbind first - then uses local lookup.
- Returns True if this name is a user sid and the conversion
- was done correctly, False if not. sidtype is set by this function.
-*****************************************************************/  
-
-BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
-{
-       fstring sid_str;
-
-       /* if we know its local then don't try winbindd */
-       if (sid_compare_domain(get_global_sam_sid(), psid) == 0) {
-               BOOL result;
-               become_root();
-               result = local_sid_to_uid(puid, psid, sidtype);
-               unbecome_root();
-               return result;
-       }
-
-/* (tridge) I commented out the slab of code below in order to support foreign SIDs
-   Do we really need to validate the type of SID we have in this case? 
-*/
-#if 0
-       fstring dom_name, name;
-       enum SID_NAME_USE name_type;
-
-       *sidtype = SID_NAME_UNKNOWN;
-       /*
-        * First we must look up the name and decide if this is a user sid.
-        */
-
-       if ( (!winbind_lookup_sid(psid, dom_name, name, &name_type)) || (name_type != SID_NAME_USER) ) {
-               BOOL result;
-               DEBUG(10,("sid_to_uid: winbind lookup for sid %s failed - trying local.\n",
-                               sid_to_string(sid_str, psid) ));
-
-               become_root();
-               result = local_sid_to_uid(puid, psid, sidtype);
-               unbecome_root();
-               return result;
-       }
-
-       /*
-        * Ensure this is a user sid.
-        */
-
-       if (name_type != SID_NAME_USER) {
-               DEBUG(10,("sid_to_uid: winbind lookup succeeded but SID is not a uid (%u)\n",
-                               (unsigned int)name_type ));
-               return False;
-       }
-#endif
-       *sidtype = SID_NAME_USER;
-
-       /*
-        * Get the uid for this SID.
-        */
-
-       if (!winbind_sid_to_uid(puid, psid)) {
-               BOOL result;
-               DEBUG(10,("sid_to_uid: winbind lookup for sid %s failed.\n",
-                               sid_to_string(sid_str, psid) ));
-               become_root();
-               result = local_sid_to_uid(puid, psid, sidtype);
-               unbecome_root();
-               return result;
-       }
-
-       DEBUG(10,("sid_to_uid: winbindd %s -> %u\n",
-               sid_to_string(sid_str, psid),
-               (unsigned int)*puid ));
-
-       return True;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert SID to gid function.
- Tries winbind first - then uses local lookup.
- Returns True if this name is a user sid and the conversion
- was done correctly, False if not.
-*****************************************************************/  
-
-BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
-{
-       fstring dom_name, name, sid_str;
-       enum SID_NAME_USE name_type;
-
-       *sidtype = SID_NAME_UNKNOWN;
-
-       /*
-        * First we must look up the name and decide if this is a group sid.
-        */
-
-       /* if we know its local then don't try winbindd */
-       if (sid_compare_domain(get_global_sam_sid(), psid) == 0) {
-               BOOL result;
-               become_root();
-               result = local_sid_to_gid(pgid, psid, sidtype);
-               unbecome_root();
-               return result;
-       }
-
-       if (!winbind_lookup_sid(psid, dom_name, name, &name_type)) {
-               DEBUG(10,("sid_to_gid: winbind lookup for sid %s failed.\n",
-                               sid_to_string(sid_str, psid) ));
-               /* this was probably a foreign sid - assume its a group rid 
-                  and continue */
-               name_type = SID_NAME_DOM_GRP;
-       }
-
-       /*
-        * Ensure this is a group sid.
-        */
-
-       if ((name_type != SID_NAME_DOM_GRP) && (name_type != SID_NAME_ALIAS) && (name_type != SID_NAME_WKN_GRP)) {
-               DEBUG(10,("sid_to_gid: winbind lookup succeeded but SID is not a known group (%u)\n",
-                               (unsigned int)name_type ));
-
-               return False;
-       }
-
-       *sidtype = name_type;
-
-       /*
-        * Get the gid for this SID.
-        */
-
-       if (!winbind_sid_to_gid(pgid, psid)) {
-               DEBUG(10,("sid_to_gid: winbind lookup for sid %s failed.\n",
-                               sid_to_string(sid_str, psid) ));
-               return False;
-       }
-
-       DEBUG(10,("sid_to_gid: winbindd %s -> %u\n",
-               sid_to_string(sid_str, psid),
-               (unsigned int)*pgid ));
-
-       return True;
-}
-