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

[vlendec at samba.org]

Author: vlendec
Date: 2005-02-03 14:31:51 +0000 (Thu, 03 Feb 2005)
New Revision: 5202

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

Log:
Trivial simplification
Modified:
   trunk/source/nsswitch/winbindd_util.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2005-02-03 14:28:54 UTC (rev 5201)
+++ trunk/source/nsswitch/winbindd_util.c	2005-02-03 14:31:51 UTC (rev 5202)
@@ -478,7 +478,7 @@
  * @return The domain structure for the named domain, if it is working.
  */
 
-struct winbindd_domain *find_domain_from_name(const char *domain_name)
+struct winbindd_domain *find_domain_from_name_noinit(const char *domain_name)
 {
 	struct winbindd_domain *domain;
 
@@ -486,10 +486,8 @@
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
 		if (strequal(domain_name, domain->name) ||
-		    (domain->alt_name[0] && strequal(domain_name, domain->alt_name))) {
-			if (!domain->initialized)
-				set_dc_type_and_flags(domain);
-
+		    (domain->alt_name[0] &&
+		     strequal(domain_name, domain->alt_name))) {
 			return domain;
 		}
 	}
@@ -499,23 +497,19 @@
 	return NULL;
 }
 
-struct winbindd_domain *find_domain_from_name_noinit(const char *domain_name)
+struct winbindd_domain *find_domain_from_name(const char *domain_name)
 {
 	struct winbindd_domain *domain;
 
-	/* Search through list */
+	domain = find_domain_from_name_noinit(domain_name);
 
-	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		if (strequal(domain_name, domain->name) ||
-		    (domain->alt_name[0] &&
-		     strequal(domain_name, domain->alt_name))) {
-			return domain;
-		}
-	}
+	if (domain == NULL)
+		return NULL;
 
-	/* Not found */
+	if (!domain->initialized)
+		set_dc_type_and_flags(domain);
 
-	return NULL;
+	return domain;
 }
 
 /* Given a domain sid, return the struct winbindd domain info for it */