From f1db1cfcccff182445c6b011193fa7a6d64319ba Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 19 Oct 2007 16:32:34 +0000 Subject: [PATCH] Plug memory leak introduced with my last commit. --- loadcfg.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/loadcfg.c b/loadcfg.c index 085f4708..1e6dc57d 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.66 2007/08/05 14:02:09 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.67 2007/10/14 14:12:41 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,10 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.66 2007/08/05 14:02:09 fabiankeil * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.67 2007/10/14 14:12:41 fabiankeil + * When in daemon mode, close stderr after the configuration file has been + * parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436. + * * Revision 1.66 2007/08/05 14:02:09 fabiankeil * #1763173 from Stefan Huehner: declare unload_configfile() static. * @@ -1298,10 +1302,13 @@ struct configuration_spec * load_config(void) * In logdir by default * *************************************************************************/ case hash_logfile : - logfile = make_path(config->logdir, arg); - if (NULL == logfile) + if (!no_daemon) { - log_error(LOG_LEVEL_FATAL, "Out of memore while creating logfile path"); + logfile = make_path(config->logdir, arg); + if (NULL == logfile) + { + log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path"); + } } continue; -- 2.39.2