Fix compatibility problems with old ScanHeader option.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/clamsmtpd.c b/src/clamsmtpd.c
index f9f1bf8..56a9f95 100644
--- a/src/clamsmtpd.c
+++ b/src/clamsmtpd.c
@@ -167,15 +167,15 @@ int main(int argc, char* argv[])
     memset(&g_clstate, 0, sizeof(g_clstate));
     g_clstate.directory = _PATH_TMP;
 
-    /* Setup a default header */
-    sp_parse_option(CFG_HEADER, DEFAULT_HEADER);
-
     /* We need the default to parse into a useable form, so we do this: */
     r = cb_parse_option(CFG_CLAMADDR, DEFAULT_CLAMAV);
     ASSERT(r == 1);
 
     sp_init("clamsmtpd");
 
+    /* Setup a default header */
+    sp_parse_option(CFG_HEADER, DEFAULT_HEADER);
+
     /*
      * We still accept our old arguments for compatibility reasons.
      * We fill them into the spstate structure directly
@@ -401,7 +401,7 @@ int cb_parse_option(const char* name, const char* value)
     {
         /* Pass old format header option through */
         warnx("please use \"Header\" option instead of \"ScanHeader\"");
-        return sp_parse_option(CFG_HEADER, optarg);
+        return sp_parse_option(CFG_HEADER, value);
     }
 
     else if(strcasecmp(CFG_DIRECTORY, name) == 0)