httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r1526499 - /httpd/httpd/trunk/modules/ldap/util_ldap.c
Date Thu, 26 Sep 2013 14:03:31 GMT
Author: jfclere
Date: Thu Sep 26 14:03:31 2013
New Revision: 1526499

URL: http://svn.apache.org/r1526499
Log:
arrange previous fix.

Modified:
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1526499&r1=1526498&r2=1526499&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Thu Sep 26 14:03:31 2013
@@ -2430,6 +2430,9 @@ static const char *util_ldap_set_trusted
                                                      const char *file,
                                                      const char *password)
 {
+#if APR_HAS_MICROSOFT_LDAPSDK
+    return "certificates cannot be set using this method.";
+#else
     util_ldap_config_t *dc =  config;
     apr_finfo_t finfo;
     apr_status_t rv;
@@ -2494,6 +2497,7 @@ static const char *util_ldap_set_trusted
     }
 
     return(NULL);
+#endif
 }
 
 
@@ -2508,9 +2512,6 @@ static const char *util_ldap_set_trusted
 static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy,
                                               const char *mode)
 {
-#if APR_HAS_MICROSOFT_LDAPSDK
-    return "certificates cannot be set using this method.";
-#else
     util_ldap_state_t *st =
     (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
                                               &ldap_module);
@@ -2536,7 +2537,6 @@ static const char *util_ldap_set_trusted
 
     st->secure_set = 1;
     return(NULL);
-#endif
 }
 
 static const char *util_ldap_set_verify_srv_cert(cmd_parms *cmd,



Mime
View raw message