Synch 6.3.20 news section and merge fetchmail-SA-2011-01.

[~andy/fetchmail] / conf.c

diff --git a/conf.c b/conf.c
index 1cab1e42649e0f60898b7c3ac4d692fe0d1fbe8d..f02dbc76897d60633cba8ff6835ac92f6bae34aa 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -282,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);
 
@@ -308,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('[');