svn commit: samba r22711 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-05-06 20:32:36 +0000 (Sun, 06 May 2007)
New Revision: 22711

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

Log:
Fix a compile warnign in query_user().  Ensure that user_rid
is initialized.


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2007-05-06 20:16:12 UTC (rev 22710)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2007-05-06 20:32:36 UTC (rev 22711)
@@ -461,7 +461,6 @@
 	char *sidstr;
 	uint32 group_rid;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	uint32 user_rid;
 	NET_USER_INFO_3 *user;
 
 	DEBUG(3,("ads: query_user\n"));
@@ -478,7 +477,7 @@
 		DEBUG(5,("query_user: Cache lookup succeeded for %s\n", 
 			sid_string_static(sid)));
 
-		sid_compose(&info->user_sid, &domain->sid, user_rid);
+		sid_compose(&info->user_sid, &domain->sid, user->user_rid);
 		sid_compose(&info->group_sid, &domain->sid, user->group_rid);
 				
 		info->acct_name = unistr2_tdup(mem_ctx, &user->uni_user_name);

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c	2007-05-06 20:16:12 UTC (rev 22710)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c	2007-05-06 20:32:36 UTC (rev 22711)
@@ -438,7 +438,7 @@
 		DEBUG(5,("query_user: Cache lookup succeeded for %s\n", 
 			sid_string_static(user_sid)));
 
-		sid_compose(&user_info->user_sid, &domain->sid, user_rid);
+		sid_compose(&user_info->user_sid, &domain->sid, user->user_rid);
 		sid_compose(&user_info->group_sid, &domain->sid,
 			    user->group_rid);
 				

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c	2007-05-06 20:16:12 UTC (rev 22710)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c	2007-05-06 20:32:36 UTC (rev 22711)
@@ -461,7 +461,6 @@
 	char *sidstr;
 	uint32 group_rid;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	uint32 user_rid;
 	NET_USER_INFO_3 *user;
 
 	DEBUG(3,("ads: query_user\n"));
@@ -478,7 +477,7 @@
 		DEBUG(5,("query_user: Cache lookup succeeded for %s\n", 
 			sid_string_static(sid)));
 
-		sid_compose(&info->user_sid, &domain->sid, user_rid);
+		sid_compose(&info->user_sid, &domain->sid, user->user_rid);
 		sid_compose(&info->group_sid, &domain->sid, user->group_rid);
 				
 		info->acct_name = unistr2_tdup(mem_ctx, &user->uni_user_name);

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c	2007-05-06 20:16:12 UTC (rev 22710)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c	2007-05-06 20:32:36 UTC (rev 22711)
@@ -438,7 +438,7 @@
 		DEBUG(5,("query_user: Cache lookup succeeded for %s\n", 
 			sid_string_static(user_sid)));
 
-		sid_compose(&user_info->user_sid, &domain->sid, user_rid);
+		sid_compose(&user_info->user_sid, &domain->sid, user->user_rid);
 		sid_compose(&user_info->group_sid, &domain->sid,
 			    user->group_rid);