update

git-svn: trunk@501

clamav-devel/AUTHORS

@@ -108,6 +108,7 @@ Thomas Quinot <thomas*cuivre.fr.eu.org>
 Hector M. Rulot Segovia <Hector.Rulot*uv.es>
 David Santinoli <david*santinoli.com>
 Vijay Sarvepalli <vssarvep*office.uncg.edu>
+Matthew Seaman <m.seaman*infracaninophile.co.uk>
 Matt Sullivan <matt*sullivan.gen.nz>
 Joe Talbott <josepht*cstone.net>
 Gernot Tenchio <g.tenchio*telco-tech.de>

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Fri Apr 16 23:20:19 CEST 2004 (tk)
+----------------------------------
+  * freshclam: fix SIGHUP handling (patch by Dr Matthew J Seaman
+	       <m.seaman*infracaninophile.co.uk>)
+
 Fri Apr 16 22:21:14 CEST 2004 (tk)
 ----------------------------------
   * docs: update

clamav-devel/README

@@ -69,7 +69,7 @@ on our website: http://www.clamav.net/3rdparty.html):
     + ClamAssassin - a filter for procmail
     + Gadoyanvirus - a filter for Qmail
     + OpenProtect - a complete e-mail protection solution
-    + RevolSys-SMTP - a complete e-mail protection solution
+    + RevolSys SMTP kit for Postfix - an antispam/antivirus tools installation
     + POP3 Virus Scanner Daemon
     + mailman-clamav - a virus filter for Mailman
     + wbmclamav - a webmin module to manage ClamAV

clamav-devel/docs/html/footnode.html

@@ -130,7 +130,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 .
 .
 </PRE>
-<DT><A NAME="foot941">... file.</A><A NAME="foot941"
+<DT><A NAME="foot942">... file.</A><A NAME="foot942"
  HREF="node14.html#tex2html19"><SUP>4</SUP></A>
 <DD>More info
     on clamscan options: <B>man clamscan</B>
@@ -235,7 +235,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 .
 .
 </PRE>
-<DT><A NAME="foot1017">... read.</A><A NAME="foot1017"
+<DT><A NAME="foot1018">... read.</A><A NAME="foot1018"
  HREF="node26.html#tex2html70"><SUP>7</SUP></A>
 <DD>Only in a one-file mode (in recursive mode those errors
 	    are ignored).

clamav-devel/docs/html/index.html

@@ -200,7 +200,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <LI><A NAME="tex2html197"
   HREF="node56.html">OpenProtect</A>
 <LI><A NAME="tex2html198"
-  HREF="node57.html">RevolSys-SMTP</A>
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
 <LI><A NAME="tex2html199"
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
 <LI><A NAME="tex2html200"

clamav-devel/docs/html/node1.html

@@ -181,7 +181,7 @@ Contents</A>
 <LI><A NAME="tex2html287"
   HREF="node56.html">OpenProtect</A>
 <LI><A NAME="tex2html288"
-  HREF="node57.html">RevolSys-SMTP</A>
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
 <LI><A NAME="tex2html289"
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
 <LI><A NAME="tex2html290"

clamav-devel/docs/html/node14.html

@@ -65,7 +65,7 @@ Testing</A>
 </PRE>
     It should find some test viruses in the clamav-x.yz/test directory.
     The scan result is saved in the scan.txt log file. <A NAME="tex2html19"
-  HREF="footnode.html#foot941"><SUP>4</SUP></A>. To test clamd: start it and
+  HREF="footnode.html#foot942"><SUP>4</SUP></A>. To test clamd: start it and
     use <I>clamdscan</I> (you can also connect directly to clamd and run
     the SCAN command):
     <PRE>

clamav-devel/docs/html/node26.html

@@ -83,7 +83,7 @@ Return codes</A>
  ALT="$^7$">
 <BR>    <B>55: </B> I/O error during read.
 	    <A NAME="tex2html70"
-  HREF="footnode.html#foot1017"><SUP>7</SUP></A>
+  HREF="footnode.html#foot1018"><SUP>7</SUP></A>
 <BR>    <B>56: </B> Can't stat input file or directory. File (or directory) you want to
 	    scan doesn't exist.
 <BR>    <B>57: </B> Can't get absolute pathname of current working directory. Your

clamav-devel/docs/html/node27.html

@@ -127,7 +127,7 @@ Third party software</A>
 <LI><A NAME="tex2html666"
   HREF="node56.html">OpenProtect</A>
 <LI><A NAME="tex2html667"
-  HREF="node57.html">RevolSys-SMTP</A>
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
 <LI><A NAME="tex2html668"
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
 <LI><A NAME="tex2html669"

clamav-devel/docs/html/node56.html

@@ -45,7 +45,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
  SRC="/usr/share/latex2html/icons/contents.png"></A>  
 <BR>
 <B> Next:</B> <A NAME="tex2html1024"
-  HREF="node57.html">RevolSys-SMTP</A>
+  HREF="node57.html">RevolSys SMTP kit for</A>
 <B> Up:</B> <A NAME="tex2html1020"
   HREF="node27.html">Third party software</A>
 <B> Previous:</B> <A NAME="tex2html1014"

clamav-devel/docs/html/node57.html

@@ -7,8 +7,8 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
   Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
 <HTML>
 <HEAD>
-<TITLE>RevolSys-SMTP</TITLE>
+<TITLE>RevolSys SMTP kit for Postfix</TITLE>
-<META NAME="description" CONTENT="RevolSys-SMTP">
+<META NAME="description" CONTENT="RevolSys SMTP kit for Postfix">
 <META NAME="keywords" CONTENT="clamdoc">
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
@@ -57,14 +57,15 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <!--End of Navigation Panel-->
 
 <H2><A NAME="SECTION000630000000000000000">
-RevolSys-SMTP</A>
+RevolSys SMTP kit for Postfix</A>
 </H2>
     <B>Homepage:</B> <TT><A NAME="tex2html98"
-  HREF="http://www.revolsys.org/">http://www.revolsys.org/</A></TT>
+  HREF="http://smtp.revolsys.org/">http://smtp.revolsys.org/</A></TT>
 <BR>    <B>Supports:</B> ClamAV via amavisd-new
 <BR>
-RevolSys-SMTP is an e-mail protection solution consisting of ClamAV,
+The RevolSyS SMTP kit for Postfix provides an antispam and antivirus
-    amavisd-new, Spamassassin and required Perl modules.
+    tools installation. It uses amavisd-new, Spamassassin, ClamAV, and Razor.
+    It aims to enhance an already-installed mail server running Postfix.
 
 <P>
 <BR><HR>

clamav-devel/docs/html/node58.html

@@ -49,7 +49,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <B> Up:</B> <A NAME="tex2html1044"
   HREF="node27.html">Third party software</A>
 <B> Previous:</B> <A NAME="tex2html1038"
-  HREF="node57.html">RevolSys-SMTP</A>
+  HREF="node57.html">RevolSys SMTP kit for</A>
  &nbsp <B>  <A NAME="tex2html1046"
   HREF="node1.html">Contents</A></B> 
 <BR>

clamav-devel/docs/html/node73.html

@@ -311,6 +311,8 @@ Contributors</A>
 </LI>
 <LI>Scsi &lt;scsi*softland.ru&gt;
 </LI>
+<LI>Dr Matthew J Seaman &lt;m.seaman*infracaninophile.co.uk&gt;
+</LI>
 <LI>Hector M. Rulot Segovia &lt;Hector.Rulot*uv.es&gt;
 </LI>
 <LI>Sergey &lt;a_s_y*sama.ru&gt;

clamav-devel/freshclam/freshclam.c

@@ -59,6 +59,7 @@ static void daemon_sighandler(int sig) {
 
 	case SIGHUP:
 	    action = "re-opening log file";
+	    terminate = -2;
 	    break;
 
 	default:
@@ -66,10 +67,8 @@ static void daemon_sighandler(int sig) {
 	    terminate = 1;
 	    break;
     }
+
     logg("Received signal %d, %s\n", sig, action);
-    if (sig == SIGHUP) {
-	logg(NULL);	/* forces log file re-opening */
-    }
     return;
 }
 
@@ -270,7 +269,7 @@ int freshclam(struct optstruct *opt)
 		    system(cpt->strarg);
 	    }
 
-	    logg("\n--------------------------------------\n");
+	    logg("--------------------------------------\n");
 	    sigaction(SIGALRM, &sigact, &oldact);
 	    sigaction(SIGUSR1, &sigact, &oldact);
 	    time(&wakeup);
@@ -280,9 +279,14 @@ int freshclam(struct optstruct *opt)
 		pause();
 		time(&now);
 	    } while (!terminate && now < wakeup);
+
 	    if (terminate == -1) {
 		terminate = 0;
+	    } else if (terminate == -2) {
+		terminate = 0;
+		logg_close();
 	    }
+
 	    sigaction(SIGALRM, &oldact, NULL);
 	    sigaction(SIGUSR1, &oldact, NULL);
 	}