Merge pull request #213 from jcu-eresearch/master

Allow compiling on GCC < 5 / CentOS 6 (see #138)
main
Valery Komarov 5 years ago committed by GitHub
commit f022103e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      ngx_http_auth_ldap_module.c

@ -41,9 +41,11 @@
#pragma clang diagnostic warning "-W#warnings" #pragma clang diagnostic warning "-W#warnings"
#else #else
#ifdef __GNUC__ #ifdef __GNUC__
#if GNUC > 4
#pragma GCC diagnostic warning "-Wcpp" #pragma GCC diagnostic warning "-Wcpp"
#endif #endif
#endif #endif
#endif
// TODO: do the same stuff for MSVC and/or other compilers // TODO: do the same stuff for MSVC and/or other compilers
@ -433,7 +435,9 @@ ngx_http_auth_ldap_ldap_server(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
#if OPENSSL_VERSION_NUMBER >= 0x10002000 #if OPENSSL_VERSION_NUMBER >= 0x10002000
server->ssl_check_cert = 1; server->ssl_check_cert = 1;
#else #else
#if GNUC > 4
#warning "http_auth_ldap: Compiling with OpenSSL < 1.0.2, certificate verification will be unavailable. OPENSSL_VERSION_NUMBER == " XSTR(OPENSSL_VERSION_NUMBER) #warning "http_auth_ldap: Compiling with OpenSSL < 1.0.2, certificate verification will be unavailable. OPENSSL_VERSION_NUMBER == " XSTR(OPENSSL_VERSION_NUMBER)
#endif
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"http_auth_ldap: 'ssl_cert_check': cannot verify remote certificate's domain name because " "http_auth_ldap: 'ssl_cert_check': cannot verify remote certificate's domain name because "
"your version of OpenSSL is too old. " "your version of OpenSSL is too old. "

Loading…
Cancel
Save