winbind: set logfile after reloading config

lp_load_global() will overwrite whatever we've set with lp_set_logfile().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14602

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 0c4497f8c66d0ea7c68d42c19e859932ebc3e2ac)

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 85b1cc6e6518fe8eac773b72224546c3df15c608..44790ea3429d96a48fd5e5ef6db359c0a8d4762b 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -114,15 +114,15 @@ bool winbindd_reload_services_file(const char *lfile)
                TALLOC_FREE(fname);
        }
 
+       reopen_logs();
+       ret = lp_load_global(get_dyn_CONFIGFILE());
+
        /* if this is a child, restore the logfile to the special
           name - <domain>, idmap, etc. */
        if (lfile && *lfile) {
                lp_set_logfile(lfile);
        }
 
-       reopen_logs();
-       ret = lp_load_global(get_dyn_CONFIGFILE());
-
        reopen_logs();
        load_interfaces();
        winbindd_setup_max_fds();