aboutsummaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-02-12 01:14:30 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-02-12 01:14:30 +0000
commit20dfee53954fb557cf867a053d4d5d29e9bedb89 (patch)
tree9bf6c2a6a3524c8b8a5779162c36e431c9d73569 /conf.c
parentd6c728ad218f79305ad759eba6d787d125c67ec3 (diff)
downloadfetchmail-20dfee53954fb557cf867a053d4d5d29e9bedb89.tar.gz
fetchmail-20dfee53954fb557cf867a053d4d5d29e9bedb89.tar.bz2
fetchmail-20dfee53954fb557cf867a053d4d5d29e9bedb89.zip
Looks like we've got the new authentication logic done.
svn path=/trunk/; revision=3072
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/conf.c b/conf.c
index d2446392..94839e2c 100644
--- a/conf.c
+++ b/conf.c
@@ -155,11 +155,11 @@ void dump_config(struct runctl *runp, struct query *querylist)
printf("'imap',");
#endif /* IMAP_ENABLE */
#ifdef GSSAPI
- printf("'imap-gss',");
+ printf("'gssapi',");
#endif /* GSSAPI */
-#if defined(IMAP4) && defined(KERBEROS_V4)
- printf("'imap-k4',");
-#endif /* defined(IMAP4) && defined(KERBEROS_V4) */
+#if defined(KERBEROS_V4)
+ printf("'kerberos',");
+#endif /* defined(IMAP4) */
#ifdef RPA_ENABLE
printf("'rpa',");
#endif /* RPA_ENABLE */
@@ -271,14 +271,18 @@ void dump_config(struct runctl *runp, struct query *querylist)
numdump("envskip", ctl->server.envskip);
stringdump("qvirtual", ctl->server.qvirtual);
- if (ctl->server.preauthenticate == A_KERBEROS_V4)
+ if (ctl->server.preauthenticate == A_ANY)
+ stringdump("preauth", "any");
+ else if (ctl->server.preauthenticate == A_PASSWORD)
+ stringdump("preauth", "password");
+ else if (ctl->server.preauthenticate == A_GSSAPI)
+ stringdump("preauth", "gssapi");
+ else if (ctl->server.preauthenticate == A_KERBEROS_V4)
stringdump("preauth", "kerberos_v4");
else if (ctl->server.preauthenticate == A_KERBEROS_V5)
stringdump("preauth", "kerberos_v5");
else if (ctl->server.preauthenticate == A_SSH)
stringdump("preauth", "ssh");
- else
- stringdump("preauth", "password");
#if defined(HAVE_GETHOSTBYNAME) && defined(HAVE_RES_SEARCH)
booldump("dns", ctl->server.dns);