@@ -1,5 +1,9 @@

 Fri Jan  2 13:08:09 CET 2009 (tk)

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

+ * shared/optparser.c, clamav-milter: use the new option parser (bb#1215)

+

+Fri Jan  2 13:08:09 CET 2009 (tk)

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

  * shared/optparser.c, sigtool: use the new option parser (bb#1215)

 Thu Jan  1 22:56:40 EET 2009 (edwin)

@@ -22,16 +22,14 @@ if HAVE_MILTER

 sbin_PROGRAMS = clamav-milter

 clamav_milter_SOURCES = \

-    $(top_srcdir)/shared/cfgparser.c \

-    $(top_srcdir)/shared/cfgparser.h \

+    $(top_srcdir)/shared/optparser.c \

+    $(top_srcdir)/shared/optparser.h \

     $(top_srcdir)/shared/output.c \

     $(top_srcdir)/shared/output.h \

     $(top_srcdir)/shared/getopt.c \

     $(top_srcdir)/shared/getopt.h \

     $(top_srcdir)/shared/misc.c \

     $(top_srcdir)/shared/misc.h \

-    $(top_srcdir)/shared/options.c \

-    $(top_srcdir)/shared/options.h \

     whitelist.c \

     whitelist.h \

     connpool.c \

@@ -72,20 +72,18 @@ CONFIG_CLEAN_FILES =

 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"

 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(sbin_PROGRAMS)

-am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/cfgparser.c \

-	$(top_srcdir)/shared/cfgparser.h $(top_srcdir)/shared/output.c \

+am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/optparser.c \

+	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/getopt.c \

 	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/misc.c \

-	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/options.c \

-	$(top_srcdir)/shared/options.h whitelist.c whitelist.h \

-	connpool.c connpool.h netcode.c netcode.h clamfi.c clamfi.h \

+	$(top_srcdir)/shared/misc.h whitelist.c whitelist.h connpool.c \

+	connpool.h netcode.c netcode.h clamfi.c clamfi.h \

 	clamav-milter.c

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS =  \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	cfgparser.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	optparser.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	getopt.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	misc.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	options.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	whitelist.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	connpool.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	netcode.$(OBJEXT) \

@@ -270,16 +268,14 @@ target_vendor = @target_vendor@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/cfgparser.c \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/cfgparser.h \

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.c \

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.h \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/options.c \

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/options.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    connpool.c \

@@ -381,14 +377,13 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgparser.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamfi.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connpool.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netcode.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whitelist.Po@am__quote@

@@ -413,19 +408,19 @@ distclean-compile:

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

-cfgparser.o: $(top_srcdir)/shared/cfgparser.c

-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cfgparser.o -MD -MP -MF $(DEPDIR)/cfgparser.Tpo -c -o cfgparser.o `test -f '$(top_srcdir)/shared/cfgparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cfgparser.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cfgparser.Tpo $(DEPDIR)/cfgparser.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cfgparser.c' object='cfgparser.o' libtool=no @AMDEPBACKSLASH@

+optparser.o: $(top_srcdir)/shared/optparser.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cfgparser.o `test -f '$(top_srcdir)/shared/cfgparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cfgparser.c

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c

-cfgparser.obj: $(top_srcdir)/shared/cfgparser.c

-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cfgparser.obj -MD -MP -MF $(DEPDIR)/cfgparser.Tpo -c -o cfgparser.obj `if test -f '$(top_srcdir)/shared/cfgparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cfgparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cfgparser.c'; fi`

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cfgparser.Tpo $(DEPDIR)/cfgparser.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cfgparser.c' object='cfgparser.obj' libtool=no @AMDEPBACKSLASH@

+optparser.obj: $(top_srcdir)/shared/optparser.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cfgparser.obj `if test -f '$(top_srcdir)/shared/cfgparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cfgparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cfgparser.c'; fi`

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`

 output.o: $(top_srcdir)/shared/output.c

 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c

@@ -469,20 +464,6 @@ misc.obj: $(top_srcdir)/shared/misc.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`

-options.o: $(top_srcdir)/shared/options.c

-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT options.o -MD -MP -MF $(DEPDIR)/options.Tpo -c -o options.o `test -f '$(top_srcdir)/shared/options.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/options.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/options.Tpo $(DEPDIR)/options.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/options.c' object='options.o' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o options.o `test -f '$(top_srcdir)/shared/options.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/options.c

-

-options.obj: $(top_srcdir)/shared/options.c

-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT options.obj -MD -MP -MF $(DEPDIR)/options.Tpo -c -o options.obj `if test -f '$(top_srcdir)/shared/options.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/options.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/options.c'; fi`

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/options.Tpo $(DEPDIR)/options.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/options.c' object='options.obj' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o options.obj `if test -f '$(top_srcdir)/shared/options.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/options.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/options.c'; fi`

-

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -34,9 +34,8 @@

 #include "clamav.h"

-#include "shared/options.h"

 #include "shared/output.h"

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/misc.h"

 #include "connpool.h"

@@ -64,91 +63,79 @@ struct smfiDesc descr = {

 };

 int main(int argc, char **argv) {

-    static struct cfgstruct *copt;

-    char *my_socket;

-    const struct cfgstruct *cpt;

-    struct optstruct *opt;

-    const char *short_options = "c:hV";

-    static struct option long_options[] = {

-	{"config-file", required_argument, NULL, 'c'},

-	{"help", no_argument, NULL, 'h'},

-	{"version", no_argument, NULL, 'V'},

-	{NULL, 0, NULL, 0}

-    };

-    const char *my_conf = CONFDIR "/clamav-milter.conf";

+    char *my_socket, *pt;

+    const struct optstruct *opt;

+    struct optstruct *opts;

     int ret;

-    opt = opt_parse(argc, argv, short_options, long_options, NULL, NULL);	

-    if (!opt) {

-	mprintf("!Can't parse the command line\n");

+    opts = optparse(NULL, argc, argv, 1, OPT_MILTER, 0, NULL);

+    if (!opts) {

+	mprintf("!Can't parse command line options\n");

 	return 1;

     }

-    if(opt_check(opt, "help")) {

+    if(optget(opts, "help")->enabled) {

 	printf("Usage: %s [-c <config-file>]\n\n", argv[0]);

 	printf("    --help                   -h       Show this help\n");

 	printf("    --version                -V       Show version and exit\n");

 	printf("    --config-file <file>     -c       Read configuration from file\n\n");

-	opt_free(opt);

+	optfree(opts);

 	return 0;

     }

-    if(opt->filename)

-	mprintf("^Ignoring option %s\n", opt->filename);

+    if(opts->filename)

+	mprintf("^Ignoring option %s\n", opts->filename);

-    if(opt_check(opt, "version")) {

+    if(optget(opts, "version")->enabled) {

 	printf("clamav-milter %s\n", get_version());

-	opt_free(opt);

+	optfree(opts);

 	return 0;

     }

-    if(opt_check(opt, "config-file"))

-	my_conf = opt_arg(opt, "config-file");

-

-    if((copt = getcfg(my_conf, 1, OPT_MILTER)) == NULL) {

-	printf("%s: cannot parse config file %s\n", argv[0], my_conf);

-	opt_free(opt);

+    pt = strdup(optget(opts, "config-file")->strarg);

+    if((opts = optparse(pt, 0, NULL, 1, OPT_MILTER, 0, opts)) == NULL) {

+	printf("%s: cannot parse config file %s\n", argv[0], pt);

+	free(pt);

 	return 1;

     }

+    free(pt);

-    opt_free(opt);

-

-    if((cpt = cfgopt(copt, "Chroot"))->enabled) {

-	if(chdir(cpt->strarg) != 0) {

-	    logg("!Cannot change directory to %s\n", cpt->strarg);

+    if((opt = optget(opts, "Chroot"))->enabled) {

+	if(chdir(opt->strarg) != 0) {

+	    logg("!Cannot change directory to %s\n", opt->strarg);

 	    return 1;

 	}

-	if(chroot(cpt->strarg) != 0) {

-	    logg("!chroot to %s failed. Are you root?\n", cpt->strarg);

+	if(chroot(opt->strarg) != 0) {

+	    logg("!chroot to %s failed. Are you root?\n", opt->strarg);

 	    return 1;

 	}

     }

-    if(geteuid() == 0 && (cpt = cfgopt(copt, "User"))->enabled) {

+    if(geteuid() == 0 && (opt = optget(opts, "User"))->enabled) {

         struct passwd *user = NULL;

-	if((user = getpwnam(cpt->strarg)) == NULL) {

-	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", cpt->strarg);

-	    freecfg(copt);

+	if((user = getpwnam(opt->strarg)) == NULL) {

+	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", opt->strarg);

+	    optfree(opts);

 	    return 1;

 	}

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

+	if(optget(opts, "AllowSupplementaryGroups")->enabled) {

 #ifdef HAVE_INITGROUPS

-	    if(initgroups(cpt->strarg, user->pw_gid)) {

+	    if(initgroups(opt->strarg, user->pw_gid)) {

 		fprintf(stderr, "ERROR: initgroups() failed.\n");

-		freecfg(copt);

+		optfree(opts);

 		return 1;

 	    }

 #else

 	    mprintf("!AllowSupplementaryGroups: initgroups() is not available, please disable AllowSupplementaryGroups\n");

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 #endif

 	} else {

 #ifdef HAVE_SETGROUPS

 	    if(setgroups(1, &user->pw_gid)) {

 		fprintf(stderr, "ERROR: setgroups() failed.\n");

-		freecfg(copt);

+		optfree(opts);

 		return 1;

 	    }

 #endif

@@ -156,50 +143,50 @@ int main(int argc, char **argv) {

 	if(setgid(user->pw_gid)) {

 	    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

 	if(setuid(user->pw_uid)) {

 	    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

     }

-    logg_lock = !cfgopt(copt, "LogFileUnlock")->enabled;

-    logg_time = cfgopt(copt, "LogTime")->enabled;

-    logg_size = cfgopt(copt, "LogFileMaxSize")->numarg;

-    logg_verbose = mprintf_verbose = cfgopt(copt, "LogVerbose")->enabled;

+    logg_lock = !optget(opts, "LogFileUnlock")->enabled;

+    logg_time = optget(opts, "LogTime")->enabled;

+    logg_size = optget(opts, "LogFileMaxSize")->numarg;

+    logg_verbose = mprintf_verbose = optget(opts, "LogVerbose")->enabled;

-    if((cpt = cfgopt(copt, "LogFile"))->enabled) {

+    if((opt = optget(opts, "LogFile"))->enabled) {

 	time_t currtime;

-	logg_file = cpt->strarg;

+	logg_file = opt->strarg;

 	if(strlen(logg_file) < 2 || logg_file[0] != '/') {

 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

 	time(&currtime);

 	if(logg("#+++ Started at %s", ctime(&currtime))) {

 	    fprintf(stderr, "ERROR: Can't initialize the internal logger\n");

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

     } else

 	logg_file = NULL;

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

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

+    if(optget(opts, "LogSyslog")->enabled) {

 	int fac;

-	cpt = cfgopt(copt, "LogFacility");

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

-	    logg("!LogFacility: %s: No such facility.\n", cpt->strarg);

+	opt = optget(opts, "LogFacility");

+	if((fac = logg_facility(opt->strarg)) == -1) {

+	    logg("!LogFacility: %s: No such facility.\n", opt->strarg);

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

@@ -208,23 +195,23 @@ int main(int argc, char **argv) {

     }

 #endif

-    if((cpt = cfgopt(copt, "TemporaryDirectory"))->enabled)

-	tempdir = cpt->strarg;

+    if((opt = optget(opts, "TemporaryDirectory"))->enabled)

+	tempdir = opt->strarg;

-    if(localnets_init(copt) || init_actions(copt)) {

+    if(localnets_init(opts) || init_actions(opts)) {

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

-    if((cpt = cfgopt(copt, "Whitelist"))->enabled && whitelist_init(cpt->strarg)) {

+    if((opt = optget(opts, "Whitelist"))->enabled && whitelist_init(opt->strarg)) {

 	localnets_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

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

+    if(optget(opts, "AddHeader")->enabled) {

 	char myname[255];

 	if(!gethostname(myname, sizeof(myname))) {

@@ -239,12 +226,12 @@ int main(int argc, char **argv) {

     }

     umask(0007); /* FIXME */

-    if(!(my_socket = cfgopt(copt, "MilterSocket")->strarg)) {

+    if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {

 	logg("!Please configure the MilterSocket directive\n");

 	localnets_free();

 	whitelist_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

     if(smfi_setconn(my_socket) == MI_FAILURE) {

@@ -252,7 +239,7 @@ int main(int argc, char **argv) {

 	localnets_free();

 	whitelist_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

     if(smfi_register(descr) == MI_FAILURE) {

@@ -260,55 +247,55 @@ int main(int argc, char **argv) {

 	localnets_free();

 	whitelist_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

-    cpt = cfgopt(copt, "FixStaleSocket");

-    if(smfi_opensocket(cpt->enabled) == MI_FAILURE) {

+    opt = optget(opts, "FixStaleSocket");

+    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {

 	logg("!Failed to create socket %s\n", my_socket);

 	localnets_free();

 	whitelist_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

-    maxfilesize = cfgopt(copt, "MaxFileSize")->numarg;

-    readtimeout = cfgopt(copt, "ReadTimeout")->numarg;

+    maxfilesize = optget(opts, "MaxFileSize")->numarg;

+    readtimeout = optget(opts, "ReadTimeout")->numarg;

-    cpool_init(copt);

+    cpool_init(opts);

     if (!cp) {

 	logg("!Failed to init the socket pool\n");

 	localnets_free();

 	whitelist_free();

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }	

-    if(!cfgopt(copt, "Foreground")->enabled) {

+    if(!optget(opts, "Foreground")->enabled) {

 	if(daemonize() == -1) {

 	    logg("!daemonize() failed\n");

 	    localnets_free();

 	    whitelist_free();

 	    cpool_free();

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

 	if(chdir("/") == -1)

 	    logg("^Can't change current working directory to root\n");

     }

-    if((cpt = cfgopt(copt, "PidFile"))->enabled) {

+    if((opt = optget(opts, "PidFile"))->enabled) {

 	FILE *fd;

 	mode_t old_umask = umask(0006);

-	if((fd = fopen(cpt->strarg, "w")) == NULL) {

-	    logg("!Can't save PID in file %s\n", cpt->strarg);

+	if((fd = fopen(opt->strarg, "w")) == NULL) {

+	    logg("!Can't save PID in file %s\n", opt->strarg);

 	} else {

 	    if (fprintf(fd, "%u", (unsigned int)getpid())<0) {

-	    	logg("!Can't save PID in file %s\n", cpt->strarg);

+	    	logg("!Can't save PID in file %s\n", opt->strarg);

 	    }

 	    fclose(fd);

 	}

@@ -317,7 +304,7 @@ int main(int argc, char **argv) {

     ret = smfi_main();

-    freecfg(copt);

+    optfree(opts);

     logg_close();

     cpool_free();

@@ -30,12 +30,13 @@

 #include <libmilter/mfapi.h>

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/output.h"

 #include "connpool.h"

 #include "netcode.h"

 #include "whitelist.h"

+#include "clamfi.h"

 #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)

 #define _UNUSED_ __attribute__ ((__unused__))

@@ -65,7 +66,7 @@ struct CLAMFI {

 };

-void add_x_header(SMFICTX *ctx, char *st) {

+static void add_x_header(SMFICTX *ctx, char *st) {

     smfi_chgheader(ctx, (char *)"X-Virus-Scanned", 1, xvirushdr);

     smfi_chgheader(ctx, (char *)"X-Virus-Status", 1, st);

 }

@@ -308,11 +309,11 @@ static sfsistat action_quarantine(SMFICTX *ctx) {

     return SMFIS_ACCEPT;

 }

-int init_actions(struct cfgstruct *copt) {

-    const struct cfgstruct *cpt;

+int init_actions(struct optstruct *opts) {

+    const struct optstruct *opt;

-    if((cpt = cfgopt(copt, "OnFail"))->enabled) {

-	switch(parse_action(cpt->strarg)) {

+    if((opt = optget(opts, "OnFail"))->enabled) {

+	switch(parse_action(opt->strarg)) {

 	case 0:

 	    FailAction = SMFIS_ACCEPT;

 	    break;

@@ -323,13 +324,13 @@ int init_actions(struct cfgstruct *copt) {

 	    FailAction = SMFIS_REJECT;

 	    break;

 	default:

-	    logg("!Invalid action %s for option OnFail", cpt->strarg);

+	    logg("!Invalid action %s for option OnFail", opt->strarg);

 	    return 1;

 	}

     } else FailAction = SMFIS_TEMPFAIL;

-    if((cpt = cfgopt(copt, "OnClean"))->enabled) {

-	switch(parse_action(cpt->strarg)) {

+    if((opt = optget(opts, "OnClean"))->enabled) {

+	switch(parse_action(opt->strarg)) {

 	case 0:

 	    CleanAction = action_accept;

 	    break;

@@ -346,13 +347,13 @@ int init_actions(struct cfgstruct *copt) {

 	    CleanAction = action_quarantine;

 	    break;

 	default:

-	    logg("!Invalid action %s for option OnClean", cpt->strarg);

+	    logg("!Invalid action %s for option OnClean", opt->strarg);

 	    return 1;

 	}

     } else CleanAction = action_accept;

-    if((cpt = cfgopt(copt, "OnInfected"))->enabled) {

-	switch(parse_action(cpt->strarg)) {

+    if((opt = optget(opts, "OnInfected"))->enabled) {

+	switch(parse_action(opt->strarg)) {

 	case 0:

 	    InfectedAction = action_accept;

 	    break;

@@ -369,7 +370,7 @@ int init_actions(struct cfgstruct *copt) {

 	    InfectedAction = action_quarantine;

 	    break;

 	default:

-	    logg("!Invalid action %s for option OnInfected", cpt->strarg);

+	    logg("!Invalid action %s for option OnInfected", opt->strarg);

 	    return 1;

 	}

     } else InfectedAction = action_quarantine;

@@ -1,7 +1,7 @@

 #ifndef _CLAMFI_H

 #define _CLAMFI_H

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include <libmilter/mfapi.h>

 extern uint64_t maxfilesize;

@@ -15,6 +15,6 @@ sfsistat clamfi_header(SMFICTX *ctx, char *headerf, char *headerv);

 sfsistat clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);

 sfsistat clamfi_envfrom(SMFICTX *ctx, char **argv);

 sfsistat clamfi_envrcpt(SMFICTX *ctx, char **argv);

-int init_actions(struct cfgstruct *copt);

+int init_actions(struct optstruct *opts);

 #endif

@@ -35,7 +35,7 @@

 #include <time.h>

 #include <netdb.h>

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/output.h"

 #include "connpool.h"

@@ -126,7 +126,7 @@ static int cpool_addtcp(char *addr, char *port) {

 }

-int addslot(void) {

+static int addslot(void) {

     struct CP_ENTRY *cpe;

     if(!(cpe = realloc(cp->pool, (cp->entries + 1) * sizeof(struct CP_ENTRY)))) {

@@ -149,7 +149,7 @@ int addslot(void) {

 - probe dead if (last check > 2 min || no clamd available)

 */

-void cpool_probe(void) {

+static void cpool_probe(void) {

     unsigned int i, dead=0;

     struct CP_ENTRY *cpe = cp->pool;

     time_t now = time(NULL);

@@ -170,7 +170,7 @@ void cpool_probe(void) {

 }

-void *cpool_mon(_UNUSED_ void *v) {

+static void *cpool_mon(_UNUSED_ void *v) {

     pthread_mutex_t conv;

     pthread_mutex_init(&conv, NULL);

@@ -190,8 +190,8 @@ void *cpool_mon(_UNUSED_ void *v) {

 }

-void cpool_init(struct cfgstruct *copt) {

-    const struct cfgstruct *cpt;

+void cpool_init(struct optstruct *opts) {

+    const struct optstruct *opt;

     int failed = 0;

     if(!(cp=calloc(sizeof(*cp), 1))) {

@@ -201,9 +201,9 @@ void cpool_init(struct cfgstruct *copt) {

     cp->local_cpe = NULL;

-    if((cpt = cfgopt(copt, "ClamdSocket"))->enabled) {

-	while(cpt) {

-	    char *socktype = cpt->strarg;

+    if((opt = optget(opts, "ClamdSocket"))->enabled) {

+	while(opt) {

+	    char *socktype = opt->strarg;

 	    if(addslot()) return;

 	    if(!strncasecmp(socktype, "unix:", 5)) {

@@ -220,7 +220,7 @@ void cpool_init(struct cfgstruct *copt) {

 		failed = 1;

 	    }

 	    if(failed) break;

-	    cpt = (struct cfgstruct *) cpt->nextarg;

+	    opt = opt->nextarg;

 	}

 	if(failed) {

 	    cpool_free();

@@ -11,7 +11,7 @@

 #include <netinet/ip.h>

 #include <pthread.h>

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 struct CP_ENTRY {

     struct sockaddr *server;

@@ -30,7 +30,7 @@ struct CPOOL {

     struct CP_ENTRY *pool;

 };

-void cpool_init(struct cfgstruct *copt);

+void cpool_init(struct optstruct *copt);

 void cpool_free(void);

 struct CP_ENTRY *cpool_get_rand(int *s);

@@ -38,6 +38,7 @@

 #include "shared/output.h"

+#include "shared/optparser.h"

 #include "libclamav/others.h"

 #include "netcode.h"

@@ -65,7 +66,7 @@ char *tempdir = NULL;

 long readtimeout;

-int nc_socket(struct CP_ENTRY *cpe) {

+static int nc_socket(struct CP_ENTRY *cpe) {

     int flags, s = socket(cpe->server->sa_family, SOCK_STREAM, 0);

     char er[256];

@@ -92,7 +93,7 @@ int nc_socket(struct CP_ENTRY *cpe) {

 }

-int nc_connect(int s, struct CP_ENTRY *cpe) {

+static int nc_connect(int s, struct CP_ENTRY *cpe) {

     time_t timeout = time(NULL) + TIMEOUT;

     int res = connect(s, cpe->server, cpe->socklen);

     struct timeval tv;

@@ -351,7 +352,7 @@ int nc_connect_rand(int *main, int *alt, int *local) {

 }

-int resolve(char *name, uint32_t *family, uint32_t *host) {

+static int resolve(char *name, uint32_t *family, uint32_t *host) {

     struct addrinfo hints, *res;

     if(!name) {

@@ -397,7 +398,7 @@ int resolve(char *name, uint32_t *family, uint32_t *host) {

 }

-struct LOCALNET *localnet(char *name, char *mask) {

+static struct LOCALNET *localnet(char *name, char *mask) {

     struct LOCALNET *l = (struct LOCALNET *)malloc(sizeof(*l));

     uint32_t nmask;

     unsigned int i;

@@ -505,12 +506,12 @@ void localnets_free(void) {

 }

-int localnets_init(struct cfgstruct *copt) {

-    const struct cfgstruct *cpt;

+int localnets_init(struct optstruct *opts) {

+    const struct optstruct *opt;

-    if((cpt = cfgopt(copt, "LocalNet"))->enabled) {

-	while(cpt) {

-	    char *lnetname = cpt->strarg;

+    if((opt = optget(opts, "LocalNet"))->enabled) {

+	while(opt) {

+	    char *lnetname = opt->strarg;

 	    struct LOCALNET *l;

 	    char *mask = strrchr(lnetname, '/');

@@ -525,7 +526,7 @@ int localnets_init(struct cfgstruct *copt) {

 	    }

 	    l->next = lnet;

 	    lnet = l;

-	    cpt = (struct cfgstruct *) cpt->nextarg;

+	    opt = opt->nextarg;

 	}

     }

     return 0;

@@ -4,7 +4,7 @@

 #include <sys/types.h>

 #include <sys/socket.h>

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "connpool.h"

 void nc_ping_entry(struct CP_ENTRY *cpe);

@@ -13,7 +13,7 @@ int nc_send(int s, const void *buf, size_t len);

 char *nc_recv(int s);

 int nc_sendmsg(int s, int fd);

 int nc_connect_entry(struct CP_ENTRY *cpe);

-int localnets_init(struct cfgstruct *copt);

+int localnets_init(struct optstruct *opts);

 void localnets_free(void);

 int islocalnet_name(char *name);

 int islocalnet_sock(struct sockaddr *sa);

@@ -28,6 +28,7 @@

 #include <regex.h>

 #include "shared/output.h"

+#include "whitelist.h"

 struct WHLST {

     regex_t preg;

@@ -75,10 +75,11 @@ static const struct clam_option {

     /* name,   longopt, sopt, argtype, regex, num, str, mul, owner, description, suggested */

     /* cmdline only */

-    { NULL, "help", 'h', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL, "", "" },

+    { NULL, "help", 'h', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL | OPT_MILTER, "", "" },

     { NULL, "config-file", 'c', TYPE_STRING, NULL, 0, CONFDIR"/clamd.conf", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMDSCAN, "", "" },

     { NULL, "config-file", 0, TYPE_STRING, NULL, 0, CONFDIR"/freshclam.conf", FLAG_REQUIRED, OPT_FRESHCLAM, "", "" },

-    { NULL, "version", 'V', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL, "", "" },

+    { NULL, "config-file", 'c', TYPE_STRING, NULL, 0, CONFDIR"/clamav-milter.conf", FLAG_REQUIRED, OPT_MILTER, "", "" },

+    { NULL, "version", 'V', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL | OPT_MILTER, "", "" },

     { NULL, "debug", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_SIGTOOL, "", "" },

     { NULL, "verbose", 'v', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL, "", "" },

     { NULL, "quiet", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_CLAMDSCAN | OPT_SIGTOOL, "", "" },

@@ -364,40 +365,48 @@ static const struct clam_option {

     { "ArchiveLimitMemoryUsage", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD | OPT_DEPRECATED, "", "" },

     /* Milter specific options */

-/*

-    {"ClamdSocket", OPT_QUOTESTR, -1, NULL, 1, OPT_MILTER},

-    {"MilterSocket", OPT_QUOTESTR, -1, NULL, 1, OPT_MILTER},

-    {"LocalNet", OPT_QUOTESTR, -1, NULL, 1, OPT_MILTER},

-    {"OnClean", OPT_QUOTESTR, -1, "Accept", 0, OPT_MILTER},

-    {"OnInfected", OPT_QUOTESTR, -1, "Quarantine", 0, OPT_MILTER},

-    {"OnFail", OPT_QUOTESTR, -1, "Defer", 0, OPT_MILTER},

-    {"AddHeader", TYPE_BOOL, 0, NULL, 0, OPT_MILTER},

-    {"Chroot", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER},

-    {"Whitelist", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER},

-*/

+

+    { "ClamdSocket", NULL, 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_MILTER, "", "" },

+

+    { "MilterSocket",NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "", "" },

+

+    { "LocalNet", NULL, 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_MILTER, "", "" },

+

+    { "OnClean", NULL, 0, TYPE_STRING, NULL, -1, "Accept", 0, OPT_MILTER, "", "" },

+

+    { "OnInfected", NULL, 0, TYPE_STRING, NULL, -1, "Quarantine", 0, OPT_MILTER, "", "" },

+

+    { "OnFail", NULL, 0, TYPE_STRING, NULL, -1, "Defer", 0, OPT_MILTER, "", "" },

+

+    { "AddHeader", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_MILTER, "", "" },

+

+    { "Chroot", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "", "" },

+

+    { "Whitelist", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "", "" },

+

     /* Deprecated milter options */

-/*

-    {"ArchiveBlockEncrypted", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"DatabaseDirectory", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"Debug", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"DetectBrokenExecutables", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"LeaveTemporaryFiles", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"LocalSocket", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"MailFollowURLs", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"MaxScanSize", OPT_COMPSIZE, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"MaxFiles", OPT_NUM, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"MaxRecursion", OPT_NUM, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"PhishingSignatures", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"ScanArchive", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"ScanHTML", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"ScanMail", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"ScanOLE2", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"ScanPE", TYPE_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"StreamMaxLength", OPT_COMPSIZE, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"TCPAddr", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"TCPSocket", OPT_NUM, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-    {"TemporaryDirectory", OPT_QUOTESTR, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED},

-*/

+

+    { "ArchiveBlockEncrypted", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "DatabaseDirectory", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "DetectBrokenExecutables", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "LeaveTemporaryFiles", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "LocalSocket", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "MailFollowURLs", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "MaxScanSize", NULL, 0, TYPE_SIZE, MATCH_SIZE, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "MaxFiles", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "MaxRecursion", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "PhishingSignatures", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "ScanArchive", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "ScanHTML", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "ScanMail", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "ScanOLE2", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "ScanPE", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "StreamMaxLength", NULL, 0, TYPE_SIZE, MATCH_SIZE, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "TCPAddr", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "TCPSocket", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+    { "TemporaryDirectory", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", "" },

+

     { NULL, NULL, 0, 0, NULL, 0, NULL, 0, 0, NULL, NULL }

 };