[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 e3b7416c073e2733f41a140a8aac9c5207b93561
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:02 2008 +0100

    Revert "allow skipping checks on sendmail.cf - bb#726"
    
    This reverts commit 675927859dd48d579883c6ce256040012e0f25c1.

diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index 8f996d2..e768ac9 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -541,7 +541,6 @@ static	const	char	*whitelistFile;	/*
 					 * addresses that we don't scan
 					 */
 static	const	char	*sendmailCF;	/* location of sendmail.cf to verify */
-static		int	checkCF = 1;
 static	const	char	*pidfile;
 static	int	black_hole_mode; /*
 				 * Since sendmail calls its milters before it
@@ -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."));
@@ -845,9 +843,6 @@ main(int argc, char **argv)
 				"sendmail-cf", 1, NULL, '0'
 			},
 			{
-				"no-check-cf", 0, &checkCF, 0
-			},
-			{
 				"server", 1, NULL, 's'
 			},
 			{
@@ -888,8 +883,8 @@ main(int argc, char **argv)
 
 		if(ret == -1)
 			break;
-  		else if(ret == 0)
-  			continue;
+		else if(ret == 0)
+			ret = long_options[opt_index].val;
 
 		switch(ret) {
 			case 'a':	/* e-mail errors from here */
@@ -1086,7 +1081,7 @@ main(int argc, char **argv)
 	port = argv[optind];
 
 	if(rootdir == NULL)	/* FIXME: Handle CHROOT */
-		if(checkCF && verifyIncomingSocketName(port) < 0) {
+		if(verifyIncomingSocketName(port) < 0) {
 			fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);
 			return EX_CONFIG;
 		}

-- 
Debian repository for ClamAV