Note Earl's regression fix for SSL_CTX_clear_options() on older OpenSSL.

[~andy/fetchmail] / conf.c

diff --git a/conf.c b/conf.c
index 60eb3ebbb9fc0d0f140cd52085fffdfed132da1c..e51c7ccb3ef609bd9b8ea673a7ce1875af9d6aaf 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -272,8 +272,6 @@ void dump_config(struct runctl *runp, struct query *querylist)
                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)
@@ -312,6 +310,13 @@ 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;
+           }
 
            indent(0);
            fputs("'users': ", stdout);