winbindd: simplify if condition in find_domain_from_name_noinit()
authorRalph Boehme <slow@samba.org>
Fri, 1 Dec 2017 11:23:50 +0000 (12:23 +0100)
committerRalph Boehme <slow@samba.org>
Sat, 13 Jan 2018 07:24:08 +0000 (08:24 +0100)
No change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/winbindd/winbindd_util.c

index b3439d078a3ea6445edd5f41ce9d34a4629cb16a..62eff4a563fb2e33e7653e139fb8a4d67eceb03c 100644 (file)
@@ -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;
                }
        }