Merge from appliance branch:

Don't call find_domain_from_name() from winbindd_kill_connections() as
you get stuck in an infinite loop!
(This used to be commit 8e982941d82b813197f2a9720149e60f629b5b20)

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 4814fbcfdae43d86028904d42a7f210165ead04f..4c7071d06338b70e4921d5d0007a9315be59d04a 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -224,11 +224,17 @@ BOOL domain_handles_open(struct winbindd_domain *domain)
 void winbindd_kill_connections(struct winbindd_domain *domain)
 {
        BOOL is_server = False;
-       struct winbindd_domain *server_domain;
+       struct winbindd_domain *server_domain = NULL, *tmp;
 
        /* Find pointer to domain of pdc */
 
-       server_domain = find_domain_from_name(lp_workgroup());
+       for (tmp = domain_list; tmp != NULL; tmp = tmp->next) {
+               if (strequal(domain->name, tmp->name)) {
+                       server_domain = tmp;
+                       break;
+               }
+       }
+
        if (!server_domain) return;
 
        /* If NULL passed, use pdc */