From: Ralph Boehme <slow@samba.org>
Date: Fri, 1 Dec 2017 11:23:50 +0000 (+0100)
Subject: winbindd: simplify if condition in find_domain_from_name_noinit()
X-Git-Tag: samba-4.8.0rc1~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9a9a94d84d5ca038c95666da831ea04260b1d17;p=thirdparty%2Fsamba.git

winbindd: simplify if condition in find_domain_from_name_noinit()

No change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index b3439d078a3..62eff4a563f 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -936,9 +936,13 @@ struct winbindd_domain *find_domain_from_name_noinit(const char *domain_name)
 	/* Search through list */
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		if (strequal(domain_name, domain->name) ||
-		    (domain->alt_name != NULL &&
-		     strequal(domain_name, domain->alt_name))) {
+		if (strequal(domain_name, domain->name)) {
+			return domain;
+		}
+		if (domain->alt_name == NULL) {
+			continue;
+		}
+		if (strequal(domain_name, domain->alt_name)) {
 			return domain;
 		}
 	}