Merge of lp_talloc_free() call in init_domain_list() from APPLIANCE.

(This used to be commit 48ed9dce0dab53066d3304baa0f24639a1f1755b)

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index ebca273d70226f21439ed49dafcfdb05bbae49f2..e3f00149f7f55d66433d623599d9fedc869c0b65 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -214,10 +214,17 @@ BOOL init_domain_list(void)
 
        result = cache_methods.domain_sid(domain, &domain->sid);
        while (!NT_STATUS_IS_OK(result)) {
+
                sleep(10);
                DEBUG(1,("Retrying startup domain sid fetch for %s\n",
                         domain->name));
                result = cache_methods.domain_sid(domain, &domain->sid);
+
+               /* If we don't call lp_talloc_free() here we end up 
+                  accumulating memory in the "global" lp_talloc in
+                  param/loadparm.c */
+
+               lp_talloc_free();
        }
        
        /* get any alternate name for the primary domain */