X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=conf.c;h=167aac118039b8a11cfd0f7c8c66c99516d4a945;hb=98cfcef26048bba06975e68a1aad05a8bac0d65d;hp=1cab1e42649e0f60898b7c3ac4d692fe0d1fbe8d;hpb=3e0432c01c37e7cd4f059be7dfd1a1ca2286683b;p=~andy%2Ffetchmail

diff --git a/conf.c b/conf.c
index 1cab1e42..167aac11 100644
--- a/conf.c
+++ b/conf.c
@@ -258,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_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_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 +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('[');