#ifdef OPIE_ENABLE
"'opie',"
#endif /* OPIE_ENABLE */
-#ifdef INET6_ENABLE
- "'inet6',"
-#endif /* INET6_ENABLE */
+#ifdef HAVE_SOCKS
+ "'socks',"
+#endif /* HAVE_SOCKS */
")\n";
fputs(features, stdout);
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);
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)
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);
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);
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);
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);