debug: Remove "override_logfile"

The only writer to this variable left with c377845d27d4dcd7. The
closest match for override_logfile is is_default_dyn_LOGFILEBASE()
with the opposite logic.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Sep 18 00:53:28 UTC 2021 on sn-devel-184

diff --git a/lib/util/debug.c b/lib/util/debug.c
index cd52fe4be7735f5ddb71b141861b6e2c16ccda5b..4fd17679227352323e67ecfa6a8feee915b74efe 100644 (file)
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -583,16 +583,6 @@ static void debug_backends_log(const char *msg, int msg_level)
        }
 }
 
-/* -------------------------------------------------------------------------- **
- * External variables.
- */
-
-/*
-   used to check if the user specified a
-   logfile on the command line
-*/
-bool    override_logfile;
-
 int debuglevel_get_class(size_t idx)
 {
        return dbgc_config[idx].loglevel;

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index d43c52bb406f5321919a5ca9bb23d55e166ef79f..44121e9915ca09b4e02d973bebd0c4e5fb954570 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -37,8 +37,6 @@ int global_nmb_port = -1;
 extern bool rescan_listen_set;
 extern bool global_in_nmbd;
 
-extern bool override_logfile;
-
 /* have we found LanMan clients yet? */
 bool found_lm_clients = False;
 
@@ -857,7 +855,7 @@ static bool open_sockets(bool isdaemon, int port)
 
        sys_srandom(time(NULL) ^ getpid());
 
-       if (!override_logfile) {
+       if (is_default_dyn_LOGFILEBASE()) {
                char *lfile = NULL;
                if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
                        exit(1);

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 8c35b8eae76aadbbc4ecc777a6b98a9df9cee4f5..25d8b7230101a3e47e774e4049821f136fc4f23f 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -64,8 +64,6 @@ static void winbindd_setup_max_fds(void);
 static bool opt_nocache = False;
 static bool interactive = False;
 
-extern bool override_logfile;
-
 struct imessaging_context *winbind_imessaging_context(void)
 {
        static struct imessaging_context *msg = NULL;
@@ -1718,7 +1716,7 @@ int main(int argc, const char **argv)
 
        poptFreeContext(pc);
 
-       if (!override_logfile) {
+       if (is_default_dyn_LOGFILEBASE()) {
                char *lfile = NULL;
                if (asprintf(&lfile,"%s/log.winbindd",
                                get_dyn_LOGFILEBASE()) > 0) {

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index a915f80351820f6600c7c61e9ef91340078d0939..3f46c6f4dad864cb9da5fab4636be3a79938ca5d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -98,7 +98,6 @@ struct dc_name_ip {
 };
 
 extern struct winbindd_methods reconnect_methods;
-extern bool override_logfile;
 
 static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain, bool need_rw_dc);
 static void set_dc_type_and_flags( struct winbindd_domain *domain );

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 5006d6af09617832ac04ebc7956b58261fe8b0de..e19dfafc52ffd48ad6314b88441af20997b8b683 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -47,8 +47,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-extern bool override_logfile;
-
 static void forall_domain_children(bool (*fn)(struct winbindd_child *c,
                                              void *private_data),
                                   void *private_data)
@@ -1546,16 +1544,17 @@ NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
 
        close_conns_after_fork();
 
-       if (!override_logfile && logfilename) {
+       if (is_default_dyn_LOGFILEBASE() && logfilename) {
                lp_set_logfile(logfilename);
                reopen_logs();
        }
 
        if (!winbindd_setup_sig_term_handler(false))
                return NT_STATUS_NO_MEMORY;
-       if (!winbindd_setup_sig_hup_handler(override_logfile ? NULL :
-                                           logfilename))
+       if (!winbindd_setup_sig_hup_handler(
+                   !is_default_dyn_LOGFILEBASE() ? NULL : logfilename)) {
                return NT_STATUS_NO_MEMORY;
+       }
 
        /* Stop zombies in children */
        CatchChild();
@@ -1776,10 +1775,11 @@ static bool fork_domain_child(struct winbindd_child *child)
        messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_DISCONNECT_DC,
                           winbind_msg_disconnect_dc);
-       messaging_register(global_messaging_context(),
-                          override_logfile ? NULL : child->logfilename,
-                          MSG_SMB_CONF_UPDATED,
-                          winbindd_msg_reload_services_child);
+       messaging_register(
+               global_messaging_context(),
+               !is_default_dyn_LOGFILEBASE() ? NULL : child->logfilename,
+               MSG_SMB_CONF_UPDATED,
+               winbindd_msg_reload_services_child);
 
        primary_domain = find_our_domain();