don't bother with milter conf

git-svn: trunk@4546
17 years ago · 87221a5eca
parent 3be4ac3f65
commit 87221a5eca
2 changed files with 8 additions and 1 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Tue Dec  9 03:32:08 CET 2008 (acab)
+-----------------------------------
+ * clamconf: skip milter's directives
+
 Sun Dec  7 16:17:33 CET 2008 (acab)
 -----------------------------------
 * configure, m4/resolv.m4: remove stale checks
--- a/clamconf/clamconf.c
+++ b/clamconf/clamconf.c
@ -84,7 +84,7 @@ static void printcfg(const char *cfgfile, int nondef)
 	unsigned short cfgowner = 0;


-	if(!(cfg = getcfg(cfgfile, 1, OPT_FRESHCLAM|OPT_CLAMD))) {
+    if(!(cfg = getcfg(cfgfile, 1, OPT_FRESHCLAM|OPT_CLAMD))) {
 	printf("Can't parse %s\n", cfgfile);
 	return;
    }
@ -96,6 +96,9 @@ static void printcfg(const char *cfgfile, int nondef)
 	if(!opt->name)
 	    break;

+	if(!(opt->owner & (OPT_CLAMD|OPT_FRESHCLAM)))
+	    continue;
+
 	cpt = cfgopt(cfg, opt->name);

 	if((cpt->numarg != opt->numarg) || (cpt->strarg && opt->strarg && strcmp(cpt->strarg, opt->strarg))) {