svn commit: samba r6769 - branches/SAMBA_3_0/source/groupdb branches/SAMBA_3_0/source/utils trunk/source/groupdb trunk/source/utils

[tpot at samba.org]

Author: tpot
Date: 2005-05-13 07:46:29 +0000 (Fri, 13 May 2005)
New Revision: 6769

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

Log:
Fix bugzilla #2538 and #2527.  Unused variables found by Jason Mader.

Modified:
   branches/SAMBA_3_0/source/groupdb/mapping.c
   branches/SAMBA_3_0/source/utils/net_rpc_join.c
   trunk/source/groupdb/mapping.c
   trunk/source/utils/net_rpc_join.c


Changeset:
Modified: branches/SAMBA_3_0/source/groupdb/mapping.c
===================================================================
--- branches/SAMBA_3_0/source/groupdb/mapping.c	2005-05-13 07:41:13 UTC (rev 6768)
+++ branches/SAMBA_3_0/source/groupdb/mapping.c	2005-05-13 07:46:29 UTC (rev 6769)
@@ -896,7 +896,6 @@
 
 BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
 {
-	struct group *grp;
 	BOOL ret;
 	
 
@@ -920,7 +919,7 @@
 		return False;
 	}
 
-	if ( (grp=getgrgid(map->gid)) == NULL) {
+	if ( getgrgid(map->gid) == NULL) {
 		return False;
 	}
 
@@ -934,7 +933,6 @@
 ****************************************************************************/
 BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 {
-	struct group *grp;
 	BOOL ret;
 
 	if(!init_group_mapping()) {
@@ -942,7 +940,7 @@
 		return(False);
 	}
 
-	if ( (grp=getgrgid(gid)) == NULL)
+	if ( getgrgid(gid) == NULL)
 		return False;
 
 	become_root();

Modified: branches/SAMBA_3_0/source/utils/net_rpc_join.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_join.c	2005-05-13 07:41:13 UTC (rev 6768)
+++ branches/SAMBA_3_0/source/utils/net_rpc_join.c	2005-05-13 07:46:29 UTC (rev 6769)
@@ -48,7 +48,6 @@
 	uchar stored_md4_trust_password[16];
 	int retval = 1;
 	uint32 channel;
-	NTSTATUS result;
 
 	/* Connect to remote machine */
 	if (!(cli = net_make_ipc_connection(NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC))) {
@@ -69,7 +68,7 @@
 	
 	/* ensure that schannel uses the right domain */
 	fstrcpy(cli->domain, domain);
-	if (! NT_STATUS_IS_OK(result = cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
+	if (! NT_STATUS_IS_OK(cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
 		DEBUG(0,("Error in domain join verfication (fresh connection)\n"));
 		goto done;
 	}

Modified: trunk/source/groupdb/mapping.c
===================================================================
--- trunk/source/groupdb/mapping.c	2005-05-13 07:41:13 UTC (rev 6768)
+++ trunk/source/groupdb/mapping.c	2005-05-13 07:46:29 UTC (rev 6769)
@@ -896,7 +896,6 @@
 
 BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
 {
-	struct group *grp;
 	BOOL ret;
 	
 
@@ -920,7 +919,7 @@
 		return False;
 	}
 
-	if ( (grp=getgrgid(map->gid)) == NULL) {
+	if ( getgrgid(map->gid) == NULL) {
 		return False;
 	}
 
@@ -934,7 +933,6 @@
 ****************************************************************************/
 BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 {
-	struct group *grp;
 	BOOL ret;
 
 	if(!init_group_mapping()) {
@@ -942,7 +940,7 @@
 		return(False);
 	}
 
-	if ( (grp=getgrgid(gid)) == NULL)
+	if ( getgrgid(gid) == NULL)
 		return False;
 
 	become_root();

Modified: trunk/source/utils/net_rpc_join.c
===================================================================
--- trunk/source/utils/net_rpc_join.c	2005-05-13 07:41:13 UTC (rev 6768)
+++ trunk/source/utils/net_rpc_join.c	2005-05-13 07:46:29 UTC (rev 6769)
@@ -48,7 +48,6 @@
 	uchar stored_md4_trust_password[16];
 	int retval = 1;
 	uint32 channel;
-	NTSTATUS result;
 
 	/* Connect to remote machine */
 	if (!(cli = net_make_ipc_connection(NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC))) {
@@ -69,7 +68,7 @@
 	
 	/* ensure that schannel uses the right domain */
 	fstrcpy(cli->domain, domain);
-	if (! NT_STATUS_IS_OK(result = cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
+	if (! NT_STATUS_IS_OK(cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
 		DEBUG(0,("Error in domain join verfication (fresh connection)\n"));
 		goto done;
 	}