Changeset 745 for trunk/server/source3/smbd/sec_ctx.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/sec_ctx.c (modified) (10 diffs)

trunk/server/source3/smbd/sec_ctx.c

@@ -3 +3 @@
    uid/user handling
    Copyright (C) Tim Potter 2000
-   
+
    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/>.
@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "libcli/security/security_token.h"
+#include "auth.h"
+#include "smbprofile.h"
 
 extern struct current_user current_user;
@@ -27 +31 @@
 ****************************************************************************/
 
-bool unix_token_equal(const UNIX_USER_TOKEN *t1, const UNIX_USER_TOKEN *t2)
+bool unix_token_equal(const struct security_unix_token *t1, const struct security_unix_token *t2)
 {
         if (t1->uid != t2->uid || t1->gid != t2->gid ||
@@ -81 +85 @@
                 }
         }
-  
+
         /* Set effective group id */
 
@@ -132 +136 @@
 ****************************************************************************/
 
-static int get_current_groups(gid_t gid, size_t *p_ngroups, gid_t **p_groups)
+static int get_current_groups(gid_t gid, uint32_t *p_ngroups, gid_t **p_groups)
 {
         int i;
@@ -168 +172 @@
         (*p_groups) = groups;
 
-        DEBUG( 3, ( "get_current_groups: user is in %u groups: ", ngroups));
+        DEBUG( 4, ( "get_current_groups: user is in %u groups: ", ngroups));
         for (i = 0; i < ngroups; i++ ) {
-                DEBUG( 3, ( "%s%d", (i ? ", " : ""), (int)groups[i] ) );
-        }
-        DEBUG( 3, ( "\n" ) );
+                DEBUG( 4, ( "%s%d", (i ? ", " : ""), (int)groups[i] ) );
+        }
+        DEBUG( 4, ( "\n" ) );
 
         return ngroups;
@@ -207 +211 @@
         ctx_p->ut.gid = getegid();
 
-        DEBUG(3, ("push_sec_ctx(%u, %u) : sec_ctx_stack_ndx = %d\n", 
+        DEBUG(4, ("push_sec_ctx(%u, %u) : sec_ctx_stack_ndx = %d\n", 
                   (unsigned int)ctx_p->ut.uid, (unsigned int)ctx_p->ut.gid, sec_ctx_stack_ndx ));
 
@@ -301 +305 @@
 ****************************************************************************/
 
-void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, NT_USER_TOKEN *token)
+void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, struct security_token *token)
 {
         struct sec_ctx *ctx_p = &sec_ctx_stack[sec_ctx_stack_ndx];
-        
+
         /* Set the security context */
 
-        DEBUG(3, ("setting sec ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
+        DEBUG(4, ("setting sec ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
                 (unsigned int)uid, (unsigned int)gid, sec_ctx_stack_ndx));
 
-        debug_nt_user_token(DBGC_CLASS, 5, token);
+        security_token_debug(DBGC_CLASS, 5, token);
         debug_unix_user_token(DBGC_CLASS, 5, uid, gid, ngroups, groups);
 
@@ -324 +328 @@
 
         TALLOC_FREE(ctx_p->token);
-        
+
         if (ngroups) {
                 ctx_p->ut.groups = (gid_t *)memdup(groups,
@@ -415 +419 @@
         current_user.nt_user_token = prev_ctx_p->token;
 
-        DEBUG(3, ("pop_sec_ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
+        DEBUG(4, ("pop_sec_ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
                 (unsigned int)geteuid(), (unsigned int)getegid(), sec_ctx_stack_ndx));