Merge 'next' branch up to tag 'before-cpp'

[~andy/fetchmail] / conf.c

diff --git a/conf.c b/conf.c
index 5b834be0402d748335fd1e4098c5a2417f0d451b..f02dbc76897d60633cba8ff6835ac92f6bae34aa 100644 (file)
--- 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>
@@ -160,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 */
@@ -245,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); 
@@ -277,8 +270,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
                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)
@@ -291,8 +282,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
 #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);
 
@@ -317,6 +306,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('[');