svn commit: samba r12479 - in trunk/source/auth: .

vlendec at samba.org vlendec at samba.org
Sun Dec 25 13:32:53 GMT 2005


Author: vlendec
Date: 2005-12-25 13:32:52 +0000 (Sun, 25 Dec 2005)
New Revision: 12479

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12479

Log:
Remove the uid parameter from get_user_groups, this was only used in calling
debug_unix_token.

Volker


Modified:
   trunk/source/auth/auth_util.c


Changeset:
Modified: trunk/source/auth/auth_util.c
===================================================================
--- trunk/source/auth/auth_util.c	2005-12-25 11:58:30 UTC (rev 12478)
+++ trunk/source/auth/auth_util.c	2005-12-25 13:32:52 UTC (rev 12479)
@@ -744,7 +744,7 @@
  * the domain   --jerry
  ******************************************************************************/
 
-static NTSTATUS get_user_groups(const char *username, uid_t uid, gid_t gid,
+static NTSTATUS get_user_groups(const char *username, gid_t gid,
                                 size_t *n_groups, DOM_SID **groups,
 				gid_t **unix_groups)
 {
@@ -775,9 +775,6 @@
 		return NT_STATUS_NO_SUCH_USER; /* what should this return
 						* value be? */	
 
-	debug_unix_user_token(DBGC_CLASS, 5, uid, gid,
-			      n_unix_groups, *unix_groups);
-	
 	/* now setup the space for storing the SIDS */
 	
 	if (n_unix_groups > 0) {
@@ -843,7 +840,7 @@
 	BOOL is_guest;
 	uint32 rid;
 
-	status = get_user_groups(unix_username, uid, gid, 
+	status = get_user_groups(unix_username, gid, 
 				 &n_groupSIDs, &groupSIDs, &unix_groups);
 		
 	if (!NT_STATUS_IS_OK(status)) {
@@ -851,6 +848,9 @@
 		return status;
 	}
 	
+	debug_unix_user_token(DBGC_CLASS, 5, uid, gid,
+			      n_groupSIDs, unix_groups);
+	
 	is_guest = (sid_peek_rid(user_sid, &rid) &&
 		    rid == DOMAIN_USER_RID_GUEST);
 
@@ -1317,7 +1317,7 @@
 	   consistent username mapping behavior between kerberos and NTLM[SSP]
 	   authentication in domain mode security.  I.E. Username mapping
 	   should be applied to the fully qualified username
-	   (e.g. DOMAIN\user) and no just the login name.  Yes this mean swe
+	   (e.g. DOMAIN\user) and not just the login name.  Yes this means we
 	   called map_username() unnecessarily in make_user_info_map() but
 	   that is how the current code is designed.  Making the change here
 	   is the least disruptive place.  -- jerry */
@@ -1430,14 +1430,17 @@
 	/* Store the user group information in the server_info 
 	   returned to the caller. */
 	
-	nt_status = get_user_groups((*server_info)->unix_name,
-		uid, gid, &n_lgroupSIDs, &lgroupSIDs, &unix_groups);
+	nt_status = get_user_groups((*server_info)->unix_name, gid,
+				    &n_lgroupSIDs, &lgroupSIDs, &unix_groups);
 		
 	if ( !NT_STATUS_IS_OK(nt_status) ) {
 		DEBUG(4,("get_user_groups failed\n"));
 		return nt_status;
 	}
 
+	debug_unix_user_token(DBGC_CLASS, 5, uid, gid,
+			      n_lgroupSIDs, unix_groups);
+	
 	(*server_info)->groups = unix_groups;
 	(*server_info)->n_groups = n_lgroupSIDs;
 	



More information about the samba-cvs mailing list