-const char errlog_rcs[] = "$Id: errlog.c,v 1.55 2007/10/14 14:12:41 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.56 2007/10/14 14:26:56 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.56 2007/10/14 14:26:56 fabiankeil
+ * Remove the old log_error() version.
+ *
* Revision 1.55 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.
lock_logfile();
if (logfp != NULL)
{
+ log_error(LOG_LEVEL_INFO,
+ "No logfile configured while in daemon mode. Logging disabled.");
fclose(logfp);
+ logfp = NULL;
}
- logfp = NULL;
unlock_logfile();
}
lock_loginit();
lock_logfile();
- if ((logfp != NULL) && (logfp != stderr))
+ if (logfp == stderr)
+ {
+ log_error(LOG_LEVEL_INFO,
+ "Switching to daemon mode. Log messages will be written to: %s", logfname);
+ }
+ else if (logfp != NULL)
{
log_error(LOG_LEVEL_INFO, "(Re-)Open logfile \'%s\'", logfname ? logfname : "none");
}
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.67 2007/10/14 14:12:41 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.68 2007/10/19 16:32:34 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.68 2007/10/19 16:32:34 fabiankeil
+ * Plug memory leak introduced with my last commit.
+ *
* 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.
if (NULL != logfile)
{
config->logfile = logfile;
- log_error(LOG_LEVEL_INFO,
- "Switching to daemon mode. Log messages will be written to: %s", config->logfile);
init_error_log(Argv[0], config->logfile);
}
else
{
- log_error(LOG_LEVEL_INFO, "No logfile configured while in daemon mode. Logging disabled.");
disable_logging();
}
}