From: Gerald Carter <jerry@samba.org>
Date: Tue, 22 May 2007 13:43:34 +0000 (+0000)
Subject: r23074: Remove duplicate code blocks from bad merge
X-Git-Tag: samba-4.0.0alpha6~801^2~5811
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f884d761ddb3216c85d1f8fe2d6b6b9438e57c16;p=thirdparty%2Fsamba.git

r23074: Remove duplicate code blocks from bad merge
(This used to be commit 2c64638934e83e5716e47986adbb1fa07c057486)
---

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 13971be8b71..c3f8e917349 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -148,16 +148,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
 		return domain;		
 	}	
         
-	/* See if we found a match.  Check if we need to update the
-	   SID. */
-
-	if ( domain ) {
-		if ( sid_equal( &domain->sid, &global_sid_NULL ) )
-			sid_copy( &domain->sid, sid );
-
-		return domain;		
-	}	
-        
 	/* Create new domain entry */
 
 	if ((domain = SMB_MALLOC_P(struct winbindd_domain)) == NULL)