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

diff --git a/conf.c b/conf.c
index e51c7ccb..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>
@@ -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 */
@@ -248,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); 
@@ -268,32 +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_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);
 
@@ -318,6 +307,12 @@ void dump_config(struct runctl *runp, struct query *querylist)
 		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);
 	    indent('[');