[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  523d5a8 s3-winbind: Remove unused bool "local"
      from  5fb578e s3: FreeBSD does not define sin6_addr.s_addr32

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 523d5a86deccb143177dbc51e575673540ef1b89
Author: Christof Schmitt <christof.schmitt at us.ibm.com>
Date:   Mon Feb 6 11:18:29 2012 -0700

    s3-winbind: Remove unused bool "local"
    
    "local" is always False, so simply remove it and the if statement
    checking its value.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Mon Feb  6 23:27:48 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/idmap_ad.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index e19bf68..bfe7d4b 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -63,7 +63,6 @@ static ADS_STATUS ad_idmap_cached_connection_internal(struct idmap_domain *dom)
 {
 	ADS_STRUCT *ads;
 	ADS_STATUS status;
-	bool local = False;
 	fstring dc_name;
 	struct sockaddr_storage dc_ip;
 	struct idmap_ad_context *ctx;
@@ -101,10 +100,8 @@ static ADS_STATUS ad_idmap_cached_connection_internal(struct idmap_domain *dom)
 		}
 	}
 
-	if (!local) {
-		/* we don't want this to affect the users ccache */
-		setenv("KRB5CCNAME", WINBIND_CCACHE_NAME, 1);
-	}
+	/* we don't want this to affect the users ccache */
+	setenv("KRB5CCNAME", WINBIND_CCACHE_NAME, 1);
 
 	/*
 	 * At this point we only have the NetBIOS domain name.


-- 
Samba Shared Repository