From 10be81a3cd113f32eb2731bae2f531b98b09d678 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 19 Dec 2006 00:19:12 +0000 Subject: * When requesting Kerberos V4, V5 or GSSAPI, complain and exit with syntax error if any of these requested features has not been compiled in. Reported by Isaac Wilcox. * --version will now add +KRB4 or +KRB5 if Kerberos v4 or v5, respectively, have been compiled in. Reported by Isaac Wilcox. svn path=/branches/BRANCH_6-3/; revision=4995 --- NEWS | 5 +++++ fetchmail.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/NEWS b/NEWS index f375104f..251971ae 100644 --- a/NEWS +++ b/NEWS @@ -101,6 +101,11 @@ fetchmail 6.3.6 (not yet released): * Improve handling of IMAP IDLE, some servers do not reset their time counters after sending information asynchronously. Patch by Sunil Shetye, after report from Andrew Baumann. +* When requesting Kerberos V4, V5 or GSSAPI, complain and exit with syntax error + if any of these requested features has not been compiled in. Reported by Isaac + Wilcox. +* --version will now add +KRB4 or +KRB5 if Kerberos v4 or v5, respectively, have + been compiled in. Reported by Isaac Wilcox. # TRANSLATIONS: * New en_GB (British English) translation by David Lodge. diff --git a/fetchmail.c b/fetchmail.c index 6a33c3d7..4a0d0092 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -269,6 +269,12 @@ int main(int argc, char **argv) #ifdef ENABLE_NLS "+NLS" #endif /* ENABLE_NLS */ +#ifdef KERBEROS_V4 + "+KRB4" +#endif /* KERBEROS_V4 */ +#ifdef KERBEROS_V5 + "+KRB5" +#endif /* KERBEROS_V5 */ ".\n"; printf(GT_("This is fetchmail release %s"), VERSION); fputs(features, stdout); @@ -1217,6 +1223,24 @@ static int load_params(int argc, char **argv, int optind) } #endif /* SSL_ENABLE */ #undef DEFAULT +#ifndef KERBEROS_V4 + if (ctl->server.authenticate == A_KERBEROS_V4) { + report(stderr, GT_("KERBEROS v4 support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif +#ifndef KERBEROS_V5 + if (ctl->server.authenticate == A_KERBEROS_V5) { + report(stderr, GT_("KERBEROS v5 support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif +#ifndef GSSAPI + if (ctl->server.authenticate == A_GSSAPI) { + report(stderr, GT_("GSSAPI support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif /* * Make sure we have a nonempty host list to forward to. -- cgit v1.2.3