Replace nt_user_token with server_info in connection_struct
[jra/samba/.git] / source3 / smbd / uid.c
index 78dff8ffeeafa4a2d7018718b73b6bcfd0212ead..8a4a54f86725b4420902c70e4cd072628d840ba4 100644 (file)
@@ -2,17 +2,17 @@
    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 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, see <http://www.gnu.org/licenses/>.
 */
@@ -36,26 +36,29 @@ bool change_to_guest(void)
                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;
 
        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)
@@ -63,11 +66,11 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
        unsigned int i;
        struct vuid_cache_entry *ent = NULL;
        bool readonly_share;
-       NT_USER_TOKEN *token;
 
-       for (i=0;i<conn->vuid_cache.entries && i< VUID_CACHE_SIZE;i++) {
-               if (conn->vuid_cache.array[i].vuid == vuser->vuid) {
-                       ent = &conn->vuid_cache.array[i];
+       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);
@@ -83,11 +86,8 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
                vuser->server_info->unix_name, vuser->server_info->ptok,
                SNUM(conn));
 
-       token = conn->nt_user_token ?
-               conn->nt_user_token : vuser->server_info->ptok;
-
        if (!readonly_share &&
-           !share_access_check(token, lp_servicename(snum),
+           !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. */
@@ -96,17 +96,25 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
                         "security descriptor\n"));
        }
 
-       if (!share_access_check(token, lp_servicename(snum),
+       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;
-       if (conn->vuid_cache.entries < VUID_CACHE_SIZE)
-               conn->vuid_cache.entries++;
+       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 = &conn->vuid_cache.array[i];
        ent->vuid = vuser->vuid;
        ent->read_only = readonly_share;
 
@@ -116,6 +124,7 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
 
        conn->read_only = ent->read_only;
        conn->admin_user = ent->admin_user;
+       conn->server_info = ent->server_info;
 
        return(True);
 }
@@ -132,11 +141,9 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
        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"));
                return(False);
@@ -173,18 +180,21 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
                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;
                group_list = conn->groups;
                num_groups = conn->ngroups;
-               token = conn->nt_user_token;
        } else if (vuser) {
                uid = conn->admin_user ? 0 : vuser->server_info->uid;
-               gid = vuser->server_info->gid;
-               num_groups = vuser->server_info->n_groups;
-               group_list  = vuser->server_info->groups;
-               token = vuser->server_info->ptok;
+               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 in accessing "
                         "share %s.\n",vuid, lp_servicename(snum) ));
@@ -199,13 +209,6 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
 
        if((group_c = *lp_force_group(snum))) {
 
-               token = dup_nt_token(NULL, token);
-               if (token == NULL) {
-                       DEBUG(0, ("dup_nt_token failed\n"));
-                       return False;
-               }
-               must_free_token = True;
-
                if(group_c == '+') {
 
                        /*
@@ -219,16 +222,18 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
                        for (i = 0; i < num_groups; i++) {
                                if (group_list[i] == conn->gid) {
                                        gid = conn->gid;
-                                       gid_to_sid(&token->user_sids[1], gid);
+                                       gid_to_sid(&conn->server_info->ptok
+                                                  ->user_sids[1], gid);
                                        break;
                                }
                        }
                } else {
                        gid = conn->gid;
-                       gid_to_sid(&token->user_sids[1], gid);
+                       gid_to_sid(&conn->server_info->ptok->user_sids[1],
+                                  gid);
                }
        }
-       
+
        /* Now set current_user since we will immediately also call
           set_sec_ctx() */
 
@@ -236,21 +241,14 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
        current_user.ut.groups  = group_list;   
 
        set_sec_ctx(uid, gid, current_user.ut.ngroups, current_user.ut.groups,
-                   token);
-
-       /*
-        * Free the new token (as set_sec_ctx copies it).
-        */
-
-       if (must_free_token)
-               TALLOC_FREE(token);
+                   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);
 }
 
@@ -310,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 ));
 
@@ -342,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) {