[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit db9df0acabe8e9403076e99cb398c05ca6985202
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:34 2008 +0100

    Revert "Add milter --no-check-cf patch and enable it by default"
    
    This reverts commit 98ecbde7af84f7513c7d2a12ee22788bc7fd144b.

diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index b12c691..44aa7ab 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -542,7 +542,6 @@ static	const	char	*whitelistFile;	/*
 					 */
 static	const	char	*sendmailCF;	/* location of sendmail.cf to verify */
 static	const	char	*pidfile;
-static	int nocheckCF = 0;
 static	int	black_hole_mode; /*
 				 * Since sendmail calls its milters before it
 				 * looks in /etc/aliases we can spend time
@@ -638,7 +637,6 @@ help(void)
 	puts(_("\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."));
 	puts(_("\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running clamd (when using TCPsocket)."));
 	puts(_("\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"));
-	puts(_("\t--no-check-cf\t\tSkip verification of sendmail.cf"));
 	puts(_("\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."));
 	puts(_("\t--signature-file=FILE\t-F FILE\tLocation of signature file."));
 	puts(_("\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."));
@@ -842,9 +840,6 @@ main(int argc, char **argv)
 				"freshclam-monitor", 1, NULL, 'M'
 			},
 			{
-				"no-check-cf", 0, NULL, 'z'
-			},
-			{
 				"sendmail-cf", 1, NULL, '0'
 			},
 			{
@@ -1050,9 +1045,6 @@ main(int argc, char **argv)
 				debug_level = atoi(optarg);
 				break;
 #endif
-			case 'z':
-				nocheckCF = 1;
-				break;
 			default:
 #ifdef	CL_DEBUG
 				fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-e] [-l] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-x#] [-U PATH] [-M#] socket-addr\n", argv[0]);
@@ -5967,9 +5959,6 @@ verifyIncomingSocketName(const char *sockName)
 		 */
 		return 1;
 
-	if (nocheckCF) 
-		return 1;
-
 	if(sendmailCF)
 		fd = open(sendmailCF, O_RDONLY);
 	else {
diff --git a/debian/clamav-milter.default b/debian/clamav-milter.default
index 47e725e..1912174 100644
--- a/debian/clamav-milter.default
+++ b/debian/clamav-milter.default
@@ -1,5 +1,5 @@
 # Default options: 2 children max and scan outgoing and local messages
-OPTIONS="--max-children=2 -ol --no-check-cf"
+OPTIONS="--max-children=2 -ol"
 #
 # If you want to set an alternate pidfile (why?) please do it here:
 #
diff --git a/docs/man/clamav-milter.8.in b/docs/man/clamav-milter.8.in
index 020bddb..b3eedac 100644
--- a/docs/man/clamav-milter.8.in
+++ b/docs/man/clamav-milter.8.in
@@ -296,9 +296,6 @@ When starting, clamav\-milter runs some sanity checks against the sendmail.cf
 file, usually in /etc/sendmail.cf or /etc/mail/sendmail.cf. This directive
 tells clamav\-milter where to find the sendmail.cf file.
 .TP
-\fB\-\-no\-check\-cf\fR
-Skip the above check.
-.TP
 \fB\-\-black-hole-mode\fR
 Since \fIsendmail\fR calls its milters before it looks in its alias and virtuser
 tables, clamav-milter can spend time looking for malware that's going to be

-- 
Debian repository for ClamAV