svn commit: samba r13095 - in branches/SAMBA_3_0/source: include smbd

[jra at samba.org]

Author: jra
Date: 2006-01-23 23:19:31 +0000 (Mon, 23 Jan 2006)
New Revision: 13095

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

Log:
Fix warnings assigning int to a size_t.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/auth.h
   branches/SAMBA_3_0/source/include/smb.h
   branches/SAMBA_3_0/source/smbd/service.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/auth.h
===================================================================
--- branches/SAMBA_3_0/source/include/auth.h	2006-01-23 22:32:56 UTC (rev 13094)
+++ branches/SAMBA_3_0/source/include/auth.h	2006-01-23 23:19:31 UTC (rev 13095)
@@ -58,7 +58,7 @@
 	gid_t gid;
 	
 	/* This groups info is needed for when we become_user() for this uid */
-	int n_groups;
+	size_t n_groups;
 	gid_t *groups;
 	
 	/* NT group information taken from the info3 structure */

Modified: branches/SAMBA_3_0/source/include/smb.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb.h	2006-01-23 22:32:56 UTC (rev 13094)
+++ branches/SAMBA_3_0/source/include/smb.h	2006-01-23 23:19:31 UTC (rev 13095)
@@ -514,7 +514,7 @@
 	/* following groups stuff added by ih */
 
 	/* This groups info is valid for the user that *opened* the connection */
-	int ngroups;
+	size_t ngroups;
 	gid_t *groups;
 	NT_USER_TOKEN *nt_user_token;
 	

Modified: branches/SAMBA_3_0/source/smbd/service.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/service.c	2006-01-23 22:32:56 UTC (rev 13094)
+++ branches/SAMBA_3_0/source/smbd/service.c	2006-01-23 23:19:31 UTC (rev 13095)
@@ -592,6 +592,7 @@
 	}
 
 	if (conn->force_user || conn->force_group) {
+		int ngroups = 0;
 
 		/* groups stuff added by ih */
 		conn->ngroups = 0;
@@ -600,7 +601,8 @@
 		/* Find all the groups this uid is in and
 		   store them. Used by change_to_user() */
 		initialise_groups(conn->user, conn->uid, conn->gid); 
-		get_current_groups(conn->gid, &conn->ngroups,&conn->groups);
+		get_current_groups(conn->gid, &ngroups, &conn->groups);
+		conn->ngroups = ngroups;
 		
 		conn->nt_user_token =
 			create_nt_token(conn->uid, conn->gid,