summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-22 13:43:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:18 -0500
commitf884d761ddb3216c85d1f8fe2d6b6b9438e57c16 (patch)
treebca42922776d71cea12c3d25478a40b772438d33
parent9d6fd22e27a96f66a00103d23574939106684f9f (diff)
downloadsamba-f884d761ddb3216c85d1f8fe2d6b6b9438e57c16.tar.gz
samba-f884d761ddb3216c85d1f8fe2d6b6b9438e57c16.tar.bz2
samba-f884d761ddb3216c85d1f8fe2d6b6b9438e57c16.zip
r23074: Remove duplicate code blocks from bad merge
(This used to be commit 2c64638934e83e5716e47986adbb1fa07c057486)
-rw-r--r--source3/nsswitch/winbindd_util.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 13971be8b7..c3f8e91734 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)