diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2006-12-19 00:19:12 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2006-12-19 00:19:12 +0000 |
| commit | 10be81a3cd113f32eb2731bae2f531b98b09d678 (patch) | |
| tree | a2b6af5b7a6a03c9795ad230a67a10da5e3b4dfc /fetchmail.c | |
| parent | 11c8f13754f514c34e2136e5a706929955ea2230 (diff) | |
| download | fetchmail-10be81a3cd113f32eb2731bae2f531b98b09d678.tar.gz fetchmail-10be81a3cd113f32eb2731bae2f531b98b09d678.tar.bz2 fetchmail-10be81a3cd113f32eb2731bae2f531b98b09d678.zip | |
* 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
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 24 |
1 files changed, 24 insertions, 0 deletions
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. |