Add new gai.c debug source.

[~andy/fetchmail] / conf.c

diff --git a/conf.c b/conf.c
index edec8ee06a7d5343e8766363adafd5436f48afe4..e51c7ccb3ef609bd9b8ea673a7ce1875af9d6aaf 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -103,7 +103,7 @@ static void listdump(const char *name, struct idlist *list)
        for (idp = list; idp; idp = idp->next)
            if (idp->id)
            {
-               fprintf(stdout, "\"%s\"", visbuf((const char *)idp->id));
+               fprintf(stdout, "\"%s\"", visbuf(idp->id));
                if (idp->next)
                    fputs(", ", stdout);
            }
@@ -184,6 +184,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
 #ifdef OPIE_ENABLE
     "'opie',"
 #endif /* OPIE_ENABLE */
+#ifdef HAVE_SOCKS
+    "'socks',"
+#endif /* HAVE_SOCKS */
     ")\n";
     fputs(features, stdout);
 
@@ -197,6 +200,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
     stringdump("postmaster", runp->postmaster);
     booldump("bouncemail", runp->bouncemail);
     booldump("spambounce", runp->spambounce);
+    booldump("softbounce", runp->softbounce);
     stringdump("properties", runp->properties);
     booldump("invisible", runp->invisible);
     booldump("showdots", runp->showdots);
@@ -268,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)
@@ -308,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);
@@ -325,9 +334,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
        {
            char namebuf[USERNAMELEN + 1];
 
-           strlcpy(namebuf, visbuf((const char *)idp->id), sizeof(namebuf));
+           strlcpy(namebuf, visbuf(idp->id), sizeof(namebuf));
            if (idp->val.id2)
-               fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf((const char *)idp->val.id2));
+               fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf(idp->val.id2));
            else
                fprintf(stdout, "\"%s\"", namebuf);
            if (idp->next)
@@ -373,6 +382,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
        stringdump("sslproto", ctl->sslproto);
        booldump("sslcertck", ctl->sslcertck);
        stringdump("sslcertpath", ctl->sslcertpath);
+       stringdump("sslcommonname", ctl->sslcommonname);
        stringdump("sslfingerprint", ctl->sslfingerprint);
 #endif /* SSL_ENABLE */
        numdump("expunge", ctl->expunge);