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

(This used to be commit 68b1c1f533e5c91634f5da21659c8e5793cb77f7)

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 459c66bdf79be9d72055e1850a61eecd99225ac3..7c032ef93db79d5ccbf810665f9d1c940e8d0f0a 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -896,7 +896,6 @@ BOOL get_local_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
 
 BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
 {
-       struct group *grp;
        BOOL ret;
        
 
@@ -920,7 +919,7 @@ BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
                return False;
        }
 
-       if ( (grp=getgrgid(map->gid)) == NULL) {
+       if ( getgrgid(map->gid) == NULL) {
                return False;
        }
 
@@ -934,7 +933,6 @@ Returns a GROUP_MAP struct based on the gid.
 ****************************************************************************/
 BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 {
-       struct group *grp;
        BOOL ret;
 
        if(!init_group_mapping()) {
@@ -942,7 +940,7 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
                return(False);
        }
 
-       if ( (grp=getgrgid(gid)) == NULL)
+       if ( getgrgid(gid) == NULL)
                return False;
 
        become_root();

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index ed196de6c1feed7bc4190ec845744d28135765d1..2f2393ca7aa345c37abc40449f318b6c6e95341c 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -48,7 +48,6 @@ static int net_rpc_join_ok(const char *domain)
        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 @@ static int net_rpc_join_ok(const char *domain)
        
        /* 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;
        }