@@ -1,3 +1,8 @@

+Fri Feb 23 19:22:43 GMT 2007 (njh)

+----------------------------------

+  * clamav-milter/clamav-milter.c:	Fix compilation error on Solaris

+			(bug 347)

+

 Fri Feb 23 18:19:43 CET 2007 (tk)

 ---------------------------------

   * clamd/scanner.c: fix compilation error on Solaris (bb#341)

@@ -32,7 +37,7 @@ Thu Feb 22 16:51:33 CET 2007 (tk)

 Thu Feb 22 15:32:33 GMT 2007 (njh)

 ----------------------------------

   * libclamav:	s/sanitiseFilename/cli_sanitise_filename/, patch from trog

-  		Changed some strdup to cli_strdup

+		Changed some strdup to cli_strdup

 Thu Feb 22 15:43:33 CET 2007 (acab)

 -----------------------------------

@@ -33,7 +33,7 @@

  */

 static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 njh Exp $";

-#define	CM_VERSION	"devel-220207"

+#define	CM_VERSION	"devel-230207"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -124,19 +124,19 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 nj

 #endif

+#ifdef	USE_SYSLOG

+#include <syslog.h>

+#endif

+

 #ifdef	WITH_TCPWRAP

 #if	HAVE_TCPD_H

 #include <tcpd.h>

 #endif

-#ifdef	USE_SYSLOG

-#include <syslog.h>

 int	allow_severity = LOG_DEBUG;

 int	deny_severity = LOG_NOTICE;

 #endif

-#endif

-

 #ifndef	CL_DEBUG

 static	const	char	*logFile;

 static	char	console[] = "/dev/console";

@@ -1261,7 +1261,9 @@ main(int argc, char **argv)

 	}

 	if(((cpt = cfgopt(copt, "LogSyslog")) != NULL) && cpt->enabled) {

+#if defined(USE_SYSLOG) && !defined(C_AIX)

 		int fac = LOG_LOCAL6;

+#endif

 		if(cfgopt(copt, "LogVerbose")->enabled) {

 			logg_verbose = 1;

@@ -1274,7 +1276,6 @@ main(int argc, char **argv)

 		}

 #if defined(USE_SYSLOG) && !defined(C_AIX)

 		logg_syslog = 1;

-#endif

 		if(((cpt = cfgopt(copt, "LogFacility")) != NULL) && cpt->enabled)

 			if((fac = logg_facility(cpt->strarg)) == -1) {

@@ -1283,6 +1284,7 @@ main(int argc, char **argv)

 				return EX_CONFIG;

 			}

 		openlog(progname, LOG_CONS|LOG_PID, fac);

+#endif

 	} else {

 		if(qflag)

 			fprintf(stderr, _("%s: (-q && !LogSyslog): warning - all interception message methods are off\n"),

@@ -1536,9 +1538,7 @@ main(int argc, char **argv)

 			cli_errmsg(_("Check your entry for TCPSocket in %s\n"),

 				cfgfile);

 			logg(_("!Can't find any clamd server"));

-#ifdef USE_SYSLOG

-			closelog();

-#endif

+			logg_close();

 			return EX_CONFIG;

 		}

 #endif