Browse code

don't bother with milter conf

git-svn: trunk@4546

aCaB authored on 2008/12/09 11:26:20
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Tue Dec  9 03:32:08 CET 2008 (acab)
2
+-----------------------------------
3
+ * clamconf: skip milter's directives
4
+
1 5
 Sun Dec  7 16:17:33 CET 2008 (acab)
2 6
 -----------------------------------
3 7
  * configure, m4/resolv.m4: remove stale checks
... ...
@@ -84,7 +84,7 @@ static void printcfg(const char *cfgfile, int nondef)
84 84
 	unsigned short cfgowner = 0;
85 85
 
86 86
 
87
-	if(!(cfg = getcfg(cfgfile, 1, OPT_FRESHCLAM|OPT_CLAMD))) {
87
+    if(!(cfg = getcfg(cfgfile, 1, OPT_FRESHCLAM|OPT_CLAMD))) {
88 88
 	printf("Can't parse %s\n", cfgfile);
89 89
 	return;
90 90
     }
... ...
@@ -96,6 +96,9 @@ static void printcfg(const char *cfgfile, int nondef)
96 96
 	if(!opt->name)
97 97
 	    break;
98 98
 
99
+	if(!(opt->owner & (OPT_CLAMD|OPT_FRESHCLAM)))
100
+	    continue;
101
+
99 102
 	cpt = cfgopt(cfg, opt->name);
100 103
 
101 104
 	if((cpt->numarg != opt->numarg) || (cpt->strarg && opt->strarg && strcmp(cpt->strarg, opt->strarg))) {