diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2015-01-16 21:20:31 +0100 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2015-01-16 21:20:31 +0100 |
| commit | e6340bf8226c37fc35d41e69348714cba1d7baf5 (patch) | |
| tree | fce5a5288759a4fe8f213de11837be12c25287fa /fetchmail.c | |
| parent | a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc (diff) | |
| download | fetchmail-e6340bf8226c37fc35d41e69348714cba1d7baf5.tar.gz fetchmail-e6340bf8226c37fc35d41e69348714cba1d7baf5.tar.bz2 fetchmail-e6340bf8226c37fc35d41e69348714cba1d7baf5.zip | |
Also recognize OPENSSL_NO_SSLx.
These are the macros OpenSSL defines when configured with no-ssl2 or no-ssl3,
the actual macro names are OPENSSL_NO_SSL2 and OPENSSL_NO_SSL3.
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fetchmail.c b/fetchmail.c index be0e9abd..d6452e08 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -54,6 +54,10 @@ #define ENETUNREACH 128 /* Interactive doesn't know this */ #endif /* ENETUNREACH */ +#ifdef SSL_ENABLE +#include <openssl/ssl.h> /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ +#endif + /* prototypes for internal functions */ static int load_params(int, char **, int); static void dump_params (struct runctl *runp, struct query *, flag implicit); @@ -262,13 +266,13 @@ int main(int argc, char **argv) #endif /* ODMR_ENABLE */ #ifdef SSL_ENABLE "+SSL" -#endif -#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 +#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0) || defined(OPENSSL_NO_SSL2) "-SSLv2" #endif -#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 +#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) || defined(OPENSSL_NO_SSL3) "-SSLv3" #endif +#endif #ifdef OPIE_ENABLE "+OPIE" #endif /* OPIE_ENABLE */ |