Changeset 77 for trunk/samba/source/smbd/sec_ctx.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/smbd/sec_ctx.c (modified) (8 diffs)

trunk/samba/source/smbd/sec_ctx.c

@@ -6 +6 @@
    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  of the License, or
    (at your option) any later version.
    
@@ -15 +15 @@
    
    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/>.
 */
 
@@ -193 +192 @@
         if (sec_ctx_stack_ndx == MAX_SEC_CTX_DEPTH) {
                 DEBUG(0, ("Security context stack overflow!\n"));
-                smb_panic("Security context stack overflow!\n");
+                smb_panic("Security context stack overflow!");
         }
 
@@ -227 +226 @@
         return True;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /****************************************************************************
@@ -249 +315 @@
         debug_unix_user_token(DBGC_CLASS, 5, uid, gid, ngroups, groups);
 
-        gain_root();
-
-#ifdef HAVE_SETGROUPS
-        sys_setgroups(ngroups, groups);
-#endif
+        /* Change uid, gid and supplementary group list. */
+        set_unix_security_ctx(uid, gid, ngroups, groups);
 
         ctx_p->ut.ngroups = ngroups;
@@ -283 +346 @@
         }
 
-        become_id(uid, gid);
-
         ctx_p->ut.uid = uid;
         ctx_p->ut.gid = gid;
@@ -322 +383 @@
         if (sec_ctx_stack_ndx == 0) {
                 DEBUG(0, ("Security context stack underflow!\n"));
-                smb_panic("Security context stack underflow!\n");
+                smb_panic("Security context stack underflow!");
         }
 
@@ -344 +405 @@
         current_user.uid = getuid();
 #else
-        gain_root();
-
         prev_ctx_p = &sec_ctx_stack[sec_ctx_stack_ndx];
 
-#ifdef HAVE_SETGROUPS
-        sys_setgroups(prev_ctx_p->ut.ngroups, prev_ctx_p->ut.groups);
-#endif
-
-        become_id(prev_ctx_p->ut.uid, prev_ctx_p->ut.gid);
+        /* Change uid, gid and supplementary group list. */
+        set_unix_security_ctx(prev_ctx_p->ut.uid,
+                        prev_ctx_p->ut.gid,
+                        prev_ctx_p->ut.ngroups,
+);
 
         /* Update current_user stuff */