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

[jerry at samba.org]

Author: jerry
Date: 2007-05-22 13:43:34 +0000 (Tue, 22 May 2007)
New Revision: 23074

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

Log:
Remove duplicate code blocks from bad merge


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-05-22 13:40:01 UTC (rev 23073)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-05-22 13:43:34 UTC (rev 23074)
@@ -148,16 +148,6 @@
 		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)

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c	2007-05-22 13:40:01 UTC (rev 23073)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c	2007-05-22 13:43:34 UTC (rev 23074)
@@ -157,16 +157,6 @@
 		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)