X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=conf.c;h=e51c7ccb3ef609bd9b8ea673a7ce1875af9d6aaf;hb=7f6138ffd4935043382ce5f867ee9e177e0a9787;hp=d046902be1b769b6fb6a236d0d61ff98f7fff3c7;hpb=4c159159d296e30c59fa780299644d71b2e52d3d;p=~andy%2Ffetchmail

diff --git a/conf.c b/conf.c
index d046902b..e51c7ccb 100644
--- a/conf.c
+++ b/conf.c
@@ -123,6 +123,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 {
     struct query *ctl;
     struct idlist *idp;
+    const char *features;
 
     indent_level = 0;
 
@@ -149,7 +150,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
      * This should be approximately in sync with the -V option dumping 
      * in fetchmail.c.
      */
-    printf("feature_options = ("
+    features = "feature_options = ("
 #ifdef POP2_ENABLE
     "'pop2',"
 #endif /* POP2_ENABLE */
@@ -183,10 +184,11 @@ void dump_config(struct runctl *runp, struct query *querylist)
 #ifdef OPIE_ENABLE
     "'opie',"
 #endif /* OPIE_ENABLE */
-#ifdef INET6_ENABLE
-    "'inet6',"
-#endif /* INET6_ENABLE */
-    ")\n");
+#ifdef HAVE_SOCKS
+    "'socks',"
+#endif /* HAVE_SOCKS */
+    ")\n";
+    fputs(features, stdout);
 
     fputs("# Start of configuration initializer\n", stdout);
     fputs("fetchmailrc = ", stdout);
@@ -198,6 +200,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
     stringdump("postmaster", runp->postmaster);
     booldump("bouncemail", runp->bouncemail);
     booldump("spambounce", runp->spambounce);
+    booldump("softbounce", runp->softbounce);
     stringdump("properties", runp->properties);
     booldump("invisible", runp->invisible);
     booldump("showdots", runp->showdots);
@@ -244,11 +247,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 
 	    using_kpop =
 		(ctl->server.protocol == P_POP3 &&
-#ifndef INET6_ENABLE
-		 ctl->server.port == KPOP_PORT &&
-#else
 		 ctl->server.service && !strcmp(ctl->server.service, KPOP_PORT ) &&
-#endif
 		 ctl->server.authenticate == A_KERBEROS_V4);
 
 	    stringdump("pollname", ctl->server.pollname); 
@@ -256,11 +255,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	    stringdump("via", ctl->server.via); 
 	    stringdump("protocol", 
 		       using_kpop ? "KPOP" : showproto(ctl->server.protocol));
-#ifndef INET6_ENABLE
-	    numdump("port",  ctl->server.port);
-#else
-	    stringdump("port",  ctl->server.service);
-#endif
+	    stringdump("service",  ctl->server.service);
 	    numdump("timeout",  ctl->server.timeout);
 	    numdump("interval", ctl->server.interval);
 
@@ -277,8 +272,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
 		stringdump("auth", "any");
 	    else if (ctl->server.authenticate == A_PASSWORD)
 		stringdump("auth", "password");
-	    else if (ctl->server.authenticate == A_OTP)
-		stringdump("auth", "otp");
 	    else if (ctl->server.authenticate == A_NTLM)
 		stringdump("auth", "ntlm");
 	    else if (ctl->server.authenticate == A_CRAM_MD5)
@@ -293,19 +286,21 @@ void dump_config(struct runctl *runp, struct query *querylist)
 		stringdump("auth", "ssh");
 	    else if (ctl->server.authenticate == A_OTP)
 		stringdump("auth", "otp");
+	    else if (ctl->server.authenticate == A_MSN)
+		stringdump("auth", "msn");
 
-#if defined(HAVE_GETHOSTBYNAME) && defined(HAVE_RES_SEARCH)
+#ifdef HAVE_RES_SEARCH
 	    booldump("dns", ctl->server.dns);
-#endif /* HAVE_GETHOSTBYNAME && HAVE_RES_SEARCH */
+#endif /* HAVE_RES_SEARCH */
 	    booldump("uidl", ctl->server.uidl);
 
 	    listdump("aka", ctl->server.akalist);
 	    listdump("localdomains", ctl->server.localdomains);
 
-#if defined(linux) || defined(__FreeBSD__)
+#ifdef CAN_MONITOR
 	    stringdump("interface", ctl->server.interface);
 	    stringdump("monitor", ctl->server.monitor);
-#endif /* linux || __FreeBSD__ */
+#endif
 
 	    stringdump("plugin", ctl->server.plugin);
 	    stringdump("plugout", ctl->server.plugout);
@@ -315,6 +310,13 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	    if (ctl->server.esmtp_password)
 	        stringdump("esmtppassword",ctl->server.esmtp_password);
 	    booldump("tracepolls", ctl->server.tracepolls);
+	    indent(0);
+	    switch(ctl->server.badheader) {
+		/* this is a hack - we map this to a boolean option for
+		 * fetchmailconf purposes */
+		case BHREJECT: puts("'badheader': FALSE,"); break;
+		case BHACCEPT: puts("'badheader': TRUE,"); break;
+	    }
 
 	    indent(0);
 	    fputs("'users': ", stdout);
@@ -347,6 +349,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	booldump("fetchall", ctl->fetchall);
 	booldump("keep", ctl->keep);
 	booldump("flush", ctl->flush);
+	booldump("limitflush", ctl->limitflush);
 	booldump("rewrite", ctl->rewrite);
 	booldump("stripcr", ctl->stripcr); 
 	booldump("forcecr", ctl->forcecr);
@@ -379,6 +382,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	stringdump("sslproto", ctl->sslproto);
 	booldump("sslcertck", ctl->sslcertck);
 	stringdump("sslcertpath", ctl->sslcertpath);
+	stringdump("sslcommonname", ctl->sslcommonname);
 	stringdump("sslfingerprint", ctl->sslfingerprint);
 #endif /* SSL_ENABLE */
 	numdump("expunge", ctl->expunge);