aboutsummaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1999-01-03 21:29:06 +0000
committerEric S. Raymond <esr@thyrsus.com>1999-01-03 21:29:06 +0000
commitf0633895d955e2472cbce0e82829b9d97bcd67a9 (patch)
tree5d85d5175020fa5437319a22b270ce8f8912e066 /conf.c
parent61b31d1951de8b8a73c525bbf7f7ee12b1de13c4 (diff)
downloadfetchmail-f0633895d955e2472cbce0e82829b9d97bcd67a9.tar.gz
fetchmail-f0633895d955e2472cbce0e82829b9d97bcd67a9.tar.bz2
fetchmail-f0633895d955e2472cbce0e82829b9d97bcd67a9.zip
Michael Warfield's IPv6 fixes.
svn path=/trunk/; revision=2314
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/conf.c b/conf.c
index 757a0e66..2db72830 100644
--- a/conf.c
+++ b/conf.c
@@ -230,7 +230,11 @@ void dump_config(struct runctl *runp, struct query *querylist)
using_kpop =
(ctl->server.protocol == P_POP3 &&
+#if !INET6
ctl->server.port == KPOP_PORT &&
+#else
+ 0 == strcmp( ctl->server.service, KPOP_PORT ) &&
+#endif
ctl->server.preauthenticate == A_KERBEROS_V4);
stringdump("pollname", ctl->server.pollname);
@@ -238,7 +242,11 @@ void dump_config(struct runctl *runp, struct query *querylist)
stringdump("via", ctl->server.via);
stringdump("protocol",
using_kpop ? "KPOP" : showproto(ctl->server.protocol));
+#if !INET6
numdump("port", ctl->server.port);
+#else
+ stringdump("service", ctl->server.service);
+#endif
numdump("timeout", ctl->server.timeout);
numdump("interval", ctl->server.interval);
@@ -322,7 +330,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
fputs("'lmtp':FALSE,", stdout);
#ifdef INET6
- stringdump("netsec", ctl->netsec);
+ stringdump("netsec", ctl->server.netsec);
#endif /* INET6 */
stringdump("preconnect", ctl->preconnect);
stringdump("postconnect", ctl->postconnect);