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 13971be8b711ed5f7a3d066a65d49fffba4691b9..c3f8e917349a3be901fbb5ef4cd72a8a0f3b7718 100644 (file)
--- 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)