svn commit: samba r7152 - in trunk/source/nsswitch: .

[jerry at samba.org]

Author: jerry
Date: 2005-05-31 19:56:28 +0000 (Tue, 31 May 2005)
New Revision: 7152

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

Log:
fix passing duplicate alt_names to add_trusted_domain(); fixes fd_events list corruption I was seeing in security=ads
Modified:
   trunk/source/nsswitch/winbindd_util.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2005-05-31 19:06:52 UTC (rev 7151)
+++ trunk/source/nsswitch/winbindd_util.c	2005-05-31 19:56:28 UTC (rev 7152)
@@ -262,7 +262,14 @@
 
 		if (find_domain_from_sid_noinit(&sid) == NULL) {
 			struct winbindd_domain *domain;
-			domain = add_trusted_domain(p, alt_name,
+			char *alternate_name = NULL;
+			
+			/* use the real alt_name if we have one, else pass in NULL */
+
+			if ( !strequal( alt_name, "(null)" ) )
+				alternate_name = alt_name;
+
+			domain = add_trusted_domain(p, alternate_name,
 						    &cache_methods,
 						    &sid);
 			setup_domain_child(domain, &domain->child);