Browse code

update

git-svn: trunk@501

Tomasz Kojm authored on 2004/04/17 06:28:44
Showing 15 changed files
... ...
@@ -108,6 +108,7 @@ Thomas Quinot <thomas*cuivre.fr.eu.org>
108 108
 Hector M. Rulot Segovia <Hector.Rulot*uv.es>
109 109
 David Santinoli <david*santinoli.com>
110 110
 Vijay Sarvepalli <vssarvep*office.uncg.edu>
111
+Matthew Seaman <m.seaman*infracaninophile.co.uk>
111 112
 Matt Sullivan <matt*sullivan.gen.nz>
112 113
 Joe Talbott <josepht*cstone.net>
113 114
 Gernot Tenchio <g.tenchio*telco-tech.de>
... ...
@@ -1,3 +1,8 @@
1
+Fri Apr 16 23:20:19 CEST 2004 (tk)
2
+----------------------------------
3
+  * freshclam: fix SIGHUP handling (patch by Dr Matthew J Seaman
4
+	       <m.seaman*infracaninophile.co.uk>)
5
+
1 6
 Fri Apr 16 22:21:14 CEST 2004 (tk)
2 7
 ----------------------------------
3 8
   * docs: update
... ...
@@ -69,7 +69,7 @@ on our website: http://www.clamav.net/3rdparty.html):
69 69
     + ClamAssassin - a filter for procmail
70 70
     + Gadoyanvirus - a filter for Qmail
71 71
     + OpenProtect - a complete e-mail protection solution
72
-    + RevolSys-SMTP - a complete e-mail protection solution
72
+    + RevolSys SMTP kit for Postfix - an antispam/antivirus tools installation
73 73
     + POP3 Virus Scanner Daemon
74 74
     + mailman-clamav - a virus filter for Mailman
75 75
     + wbmclamav - a webmin module to manage ClamAV
76 76
Binary files a/clamav-devel/docs/clamdoc.pdf and b/clamav-devel/docs/clamdoc.pdf differ
... ...
@@ -130,7 +130,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
130 130
 .
131 131
 .
132 132
 </PRE>
133
-<DT><A NAME="foot941">... file.</A><A NAME="foot941"
133
+<DT><A NAME="foot942">... file.</A><A NAME="foot942"
134 134
  HREF="node14.html#tex2html19"><SUP>4</SUP></A>
135 135
 <DD>More info
136 136
     on clamscan options: <B>man clamscan</B>
... ...
@@ -235,7 +235,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
235 235
 .
236 236
 .
237 237
 </PRE>
238
-<DT><A NAME="foot1017">... read.</A><A NAME="foot1017"
238
+<DT><A NAME="foot1018">... read.</A><A NAME="foot1018"
239 239
  HREF="node26.html#tex2html70"><SUP>7</SUP></A>
240 240
 <DD>Only in a one-file mode (in recursive mode those errors
241 241
 	    are ignored).
... ...
@@ -200,7 +200,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
200 200
 <LI><A NAME="tex2html197"
201 201
   HREF="node56.html">OpenProtect</A>
202 202
 <LI><A NAME="tex2html198"
203
-  HREF="node57.html">RevolSys-SMTP</A>
203
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
204 204
 <LI><A NAME="tex2html199"
205 205
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
206 206
 <LI><A NAME="tex2html200"
... ...
@@ -181,7 +181,7 @@ Contents</A>
181 181
 <LI><A NAME="tex2html287"
182 182
   HREF="node56.html">OpenProtect</A>
183 183
 <LI><A NAME="tex2html288"
184
-  HREF="node57.html">RevolSys-SMTP</A>
184
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
185 185
 <LI><A NAME="tex2html289"
186 186
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
187 187
 <LI><A NAME="tex2html290"
... ...
@@ -65,7 +65,7 @@ Testing</A>
65 65
 </PRE>
66 66
     It should find some test viruses in the clamav-x.yz/test directory.
67 67
     The scan result is saved in the scan.txt log file. <A NAME="tex2html19"
68
-  HREF="footnode.html#foot941"><SUP>4</SUP></A>. To test clamd: start it and
68
+  HREF="footnode.html#foot942"><SUP>4</SUP></A>. To test clamd: start it and
69 69
     use <I>clamdscan</I> (you can also connect directly to clamd and run
70 70
     the SCAN command):
71 71
     <PRE>
... ...
@@ -83,7 +83,7 @@ Return codes</A>
83 83
  ALT="$^7$">
84 84
 <BR>    <B>55: </B> I/O error during read.
85 85
 	    <A NAME="tex2html70"
86
-  HREF="footnode.html#foot1017"><SUP>7</SUP></A>
86
+  HREF="footnode.html#foot1018"><SUP>7</SUP></A>
87 87
 <BR>    <B>56: </B> Can't stat input file or directory. File (or directory) you want to
88 88
 	    scan doesn't exist.
89 89
 <BR>    <B>57: </B> Can't get absolute pathname of current working directory. Your
... ...
@@ -127,7 +127,7 @@ Third party software</A>
127 127
 <LI><A NAME="tex2html666"
128 128
   HREF="node56.html">OpenProtect</A>
129 129
 <LI><A NAME="tex2html667"
130
-  HREF="node57.html">RevolSys-SMTP</A>
130
+  HREF="node57.html">RevolSys SMTP kit for Postfix</A>
131 131
 <LI><A NAME="tex2html668"
132 132
   HREF="node58.html">POP3 Virus Scanner Daemon</A>
133 133
 <LI><A NAME="tex2html669"
... ...
@@ -45,7 +45,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
45 45
  SRC="/usr/share/latex2html/icons/contents.png"></A>  
46 46
 <BR>
47 47
 <B> Next:</B> <A NAME="tex2html1024"
48
-  HREF="node57.html">RevolSys-SMTP</A>
48
+  HREF="node57.html">RevolSys SMTP kit for</A>
49 49
 <B> Up:</B> <A NAME="tex2html1020"
50 50
   HREF="node27.html">Third party software</A>
51 51
 <B> Previous:</B> <A NAME="tex2html1014"
... ...
@@ -7,8 +7,8 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
7 7
   Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
8 8
 <HTML>
9 9
 <HEAD>
10
-<TITLE>RevolSys-SMTP</TITLE>
11
-<META NAME="description" CONTENT="RevolSys-SMTP">
10
+<TITLE>RevolSys SMTP kit for Postfix</TITLE>
11
+<META NAME="description" CONTENT="RevolSys SMTP kit for Postfix">
12 12
 <META NAME="keywords" CONTENT="clamdoc">
13 13
 <META NAME="resource-type" CONTENT="document">
14 14
 <META NAME="distribution" CONTENT="global">
... ...
@@ -57,14 +57,15 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
57 57
 <!--End of Navigation Panel-->
58 58
 
59 59
 <H2><A NAME="SECTION000630000000000000000">
60
-RevolSys-SMTP</A>
60
+RevolSys SMTP kit for Postfix</A>
61 61
 </H2>
62 62
     <B>Homepage:</B> <TT><A NAME="tex2html98"
63
-  HREF="http://www.revolsys.org/">http://www.revolsys.org/</A></TT>
63
+  HREF="http://smtp.revolsys.org/">http://smtp.revolsys.org/</A></TT>
64 64
 <BR>    <B>Supports:</B> ClamAV via amavisd-new
65 65
 <BR>
66
-RevolSys-SMTP is an e-mail protection solution consisting of ClamAV,
67
-    amavisd-new, Spamassassin and required Perl modules.
66
+The RevolSyS SMTP kit for Postfix provides an antispam and antivirus
67
+    tools installation. It uses amavisd-new, Spamassassin, ClamAV, and Razor.
68
+    It aims to enhance an already-installed mail server running Postfix.
68 69
 
69 70
 <P>
70 71
 <BR><HR>
... ...
@@ -49,7 +49,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
49 49
 <B> Up:</B> <A NAME="tex2html1044"
50 50
   HREF="node27.html">Third party software</A>
51 51
 <B> Previous:</B> <A NAME="tex2html1038"
52
-  HREF="node57.html">RevolSys-SMTP</A>
52
+  HREF="node57.html">RevolSys SMTP kit for</A>
53 53
  &nbsp <B>  <A NAME="tex2html1046"
54 54
   HREF="node1.html">Contents</A></B> 
55 55
 <BR>
... ...
@@ -311,6 +311,8 @@ Contributors</A>
311 311
 </LI>
312 312
 <LI>Scsi &lt;scsi*softland.ru&gt;
313 313
 </LI>
314
+<LI>Dr Matthew J Seaman &lt;m.seaman*infracaninophile.co.uk&gt;
315
+</LI>
314 316
 <LI>Hector M. Rulot Segovia &lt;Hector.Rulot*uv.es&gt;
315 317
 </LI>
316 318
 <LI>Sergey &lt;a_s_y*sama.ru&gt;
... ...
@@ -59,6 +59,7 @@ static void daemon_sighandler(int sig) {
59 59
 
60 60
 	case SIGHUP:
61 61
 	    action = "re-opening log file";
62
+	    terminate = -2;
62 63
 	    break;
63 64
 
64 65
 	default:
... ...
@@ -66,10 +67,8 @@ static void daemon_sighandler(int sig) {
66 66
 	    terminate = 1;
67 67
 	    break;
68 68
     }
69
+
69 70
     logg("Received signal %d, %s\n", sig, action);
70
-    if (sig == SIGHUP) {
71
-	logg(NULL);	/* forces log file re-opening */
72
-    }
73 71
     return;
74 72
 }
75 73
 
... ...
@@ -270,7 +269,7 @@ int freshclam(struct optstruct *opt)
270 270
 		    system(cpt->strarg);
271 271
 	    }
272 272
 
273
-	    logg("\n--------------------------------------\n");
273
+	    logg("--------------------------------------\n");
274 274
 	    sigaction(SIGALRM, &sigact, &oldact);
275 275
 	    sigaction(SIGUSR1, &sigact, &oldact);
276 276
 	    time(&wakeup);
... ...
@@ -280,9 +279,14 @@ int freshclam(struct optstruct *opt)
280 280
 		pause();
281 281
 		time(&now);
282 282
 	    } while (!terminate && now < wakeup);
283
+
283 284
 	    if (terminate == -1) {
284 285
 		terminate = 0;
286
+	    } else if (terminate == -2) {
287
+		terminate = 0;
288
+		logg_close();
285 289
 	    }
290
+
286 291
 	    sigaction(SIGALRM, &oldact, NULL);
287 292
 	    sigaction(SIGUSR1, &oldact, NULL);
288 293
 	}