You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2005/01/20 14:23:37 UTC

svn commit: r125765 - /apr/apr-util/trunk/ldap/apr_ldap_option.c

Author: minfrin
Date: Thu Jan 20 05:23:35 2005
New Revision: 125765

URL: http://svn.apache.org/viewcvs?view=rev&rev=125765
Log:
Fix build errors for Win32.

Submitted by: Colm MacCarthaigh <colm stdlib net>

Modified:
   apr/apr-util/trunk/ldap/apr_ldap_option.c

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_option.c?view=diff&rev=125765&p1=apr/apr-util/trunk/ldap/apr_ldap_option.c&r1=125764&p2=apr/apr-util/trunk/ldap/apr_ldap_option.c&r2=125765
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c	(original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c	Thu Jan 20 05:23:35 2005
@@ -242,8 +242,7 @@
     /* Microsoft SDK */
 #if APR_HAS_MICROSOFT_LDAPSDK
     if (tls == APR_LDAP_NONE) {
-        mode = 0;
-        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &mode);
+        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_OFF);
         if (result->rc != LDAP_SUCCESS) {
             result->reason = "LDAP: an attempt to set LDAP_OPT_SSL off "
                              "failed.";
@@ -251,8 +250,7 @@
         }
     }
     else if (tls == APR_LDAP_SSL) {
-        mode = 1;
-        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &mode);
+        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_ON);
         if (result->rc != LDAP_SUCCESS) {
             result->reason = "LDAP: an attempt to set LDAP_OPT_SSL on "
                              "failed.";
@@ -514,7 +512,7 @@
     /* Microsoft SDK use the registry certificate store - error out
      * here with a message explaining this. */
     result->reason = "LDAP: CA certificates cannot be set using this method, "
-                     "as they are stored in the registry instead."
+                     "as they are stored in the registry instead.";
     result->rc = -1;
 #endif