From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 22 Oct 2008 15:19:55 +0000 (+0000)
Subject: Once More, With Feeling: if there is no logfile
X-Git-Tag: v_3_0_11~194
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=e100c85003a9dc095acee7c9d229fb3aa633b0ba

Once More, With Feeling: if there is no logfile
because the user didn't specify one, we shouldn't
call init_error_log() after receiving SIGHUP either.
---

diff --git a/jcc.c b/jcc.c
index 83e73ca4..e5a76aab 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.196 2008/10/16 09:16:41 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.197 2008/10/20 17:02:40 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.196 2008/10/16 09:16:41 fabiankeil Exp $"
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.197  2008/10/20 17:02:40  fabiankeil
+ *    If SIGHUP is received while we aren't running in daemon
+ *    mode, calling init_error_log() would be a mistake.
+ *
  *    Revision 1.196  2008/10/16 09:16:41  fabiankeil
  *    - Fix two gcc44 conversion warnings.
  *    - Don't bother logging the last five bytes
@@ -3803,12 +3807,8 @@ static void listen_loop(void)
        */
       if (received_hup_signal)
       {
-         if (!no_daemon)
+         if (NULL != config->logfile)
          {
-            /*
-             * If we aren't in daemon mode, there is no log to re-open.
-             * XXX: Probably we should ignore SIGHUP then.
-             */
             init_error_log(Argv[0], config->logfile);
          }
          received_hup_signal = 0;