winbindd: collapse two if expressions

No change in behaviour.

After calling set_domain_offline() domain->offline will be set to false, iow
everytime

  if (!domain->internal && was_online)

is true,

  if (!domain->internal &&
      !domain->online &&
      was_online)

will also true, so we can drop the second if expression.

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

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index d5b8ef50822aaa1f685740d9c5c83d3f20cdaf15..22817388e870837fe64d67666adcd0e22c515bd8 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1842,14 +1842,13 @@ NTSTATUS wb_cache_name_to_sid(struct winbindd_domain *domain,
            NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND))
        {
                if (!domain->internal && was_online) {
+                       /* Set the domain offline and query the cache again */
                        set_domain_offline(domain);
-               }
-               if (!domain->internal &&
-                       !domain->online &&
-                       was_online) {
-                       NTSTATUS cache_status;
-                       cache_status = wcache_name_to_sid(domain, domain_name, name, sid, type);
-                       return cache_status;
+                       return wcache_name_to_sid(domain,
+                                                 domain_name,
+                                                 name,
+                                                 sid,
+                                                 type);
                }
        }
        /* and save it */