X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=conf.c;h=167aac118039b8a11cfd0f7c8c66c99516d4a945;hb=adad2fc62f159c7e43c36af0ad4f9bf9f6b3efc7;hp=edec8ee06a7d5343e8766363adafd5436f48afe4;hpb=7ff1619df0d9c4fc58119bd23e8e6904679db8b6;p=~andy%2Ffetchmail

diff --git a/conf.c b/conf.c
index edec8ee0..167aac11 100644
--- a/conf.c
+++ b/conf.c
@@ -9,12 +9,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#if defined(STDC_HEADERS)
 #include <stdlib.h>
-#endif
-#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
-#endif
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
@@ -103,7 +99,7 @@ static void listdump(const char *name, struct idlist *list)
 	for (idp = list; idp; idp = idp->next)
 	    if (idp->id)
 	    {
-		fprintf(stdout, "\"%s\"", visbuf((const char *)idp->id));
+		fprintf(stdout, "\"%s\"", visbuf(idp->id));
 		if (idp->next)
 		    fputs(", ", stdout);
 	    }
@@ -151,9 +147,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
      * in fetchmail.c.
      */
     features = "feature_options = ("
-#ifdef POP2_ENABLE
-    "'pop2',"
-#endif /* POP2_ENABLE */
 #ifdef POP3_ENABLE
     "'pop3',"
 #endif /* POP3_ENABLE */
@@ -163,9 +156,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
 #ifdef GSSAPI
     "'gssapi',"
 #endif /* GSSAPI */
-#if defined(KERBEROS_V4)
-    "'kerberos',"
-#endif /* defined(IMAP4) */
 #ifdef RPA_ENABLE
     "'rpa',"
 #endif /* RPA_ENABLE */
@@ -184,6 +174,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
 #ifdef OPIE_ENABLE
     "'opie',"
 #endif /* OPIE_ENABLE */
+#ifdef HAVE_SOCKS
+    "'socks',"
+#endif /* HAVE_SOCKS */
     ")\n";
     fputs(features, stdout);
 
@@ -197,6 +190,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,7 +238,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	    using_kpop =
 		(ctl->server.protocol == P_POP3 &&
 		 ctl->server.service && !strcmp(ctl->server.service, KPOP_PORT ) &&
-		 ctl->server.authenticate == A_KERBEROS_V4);
+		 ctl->server.authenticate == A_KERBEROS_V5);
 
 	    stringdump("pollname", ctl->server.pollname); 
 	    booldump("active", !ctl->server.skip); 
@@ -264,34 +258,31 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	    numdump("envskip", ctl->server.envskip);
 	    stringdump("qvirtual", ctl->server.qvirtual);
  
-	    if (ctl->server.authenticate == A_ANY)
-		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", "cram-md5");
-	    else if (ctl->server.authenticate == A_GSSAPI)
-		stringdump("auth", "gssapi");
-	    else if (ctl->server.authenticate == A_KERBEROS_V4)
-		stringdump("auth", "kerberos_v4");
-	    else if (ctl->server.authenticate == A_KERBEROS_V5)
-		stringdump("auth", "kerberos_v5");
-	    else if (ctl->server.authenticate == A_SSH)
-		stringdump("auth", "ssh");
-	    else if (ctl->server.authenticate == A_OTP)
-		stringdump("auth", "otp");
-	    else if (ctl->server.authenticate == A_MSN)
-		stringdump("auth", "msn");
+	    switch (ctl->server.authenticate) {
+		case A_ANY:
+		    stringdump("auth", "any"); break;
+		case A_PASSWORD:
+		    stringdump("auth", "password"); break;
+		case A_OTP:
+		    stringdump("auth", "otp"); break;
+		case A_NTLM:
+		    stringdump("auth", "ntlm"); break;
+		case A_CRAM_MD5:
+		    stringdump("auth", "cram-md5"); break;
+		case A_GSSAPI:
+		    stringdump("auth", "gssapi"); break;
+		case A_KERBEROS_V5:
+		    stringdump("auth", "kerberos_v5"); break;
+		case A_SSH:
+		    stringdump("auth", "ssh"); break;
+		case A_MSN:
+		    stringdump("auth", "msn"); break;
+		default: abort();
+	    }
 
 #ifdef HAVE_RES_SEARCH
 	    booldump("dns", ctl->server.dns);
 #endif /* HAVE_RES_SEARCH */
-	    booldump("uidl", ctl->server.uidl);
-
 	    listdump("aka", ctl->server.akalist);
 	    listdump("localdomains", ctl->server.localdomains);
 
@@ -308,6 +299,19 @@ 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;
+	    }
+
+	    switch (ctl->server.retrieveerror) {
+		case RE_ABORT: stringdump("retrieveerror", "abort"); break;
+		case RE_CONTINUE: stringdump("retrieveerror", "continue"); break;
+		case RE_MARKSEEN: stringdump("retrieveerror", "markseen"); break;
+	    }
 
 	    indent(0);
 	    fputs("'users': ", stdout);
@@ -325,9 +329,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	{
 	    char namebuf[USERNAMELEN + 1];
 
-	    strlcpy(namebuf, visbuf((const char *)idp->id), sizeof(namebuf));
+	    strlcpy(namebuf, visbuf(idp->id), sizeof(namebuf));
 	    if (idp->val.id2)
-		fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf((const char *)idp->val.id2));
+		fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf(idp->val.id2));
 	    else
 		fprintf(stdout, "\"%s\"", namebuf);
 	    if (idp->next)
@@ -373,6 +377,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);