apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r640388 - in /apr/apr-util/trunk: CHANGES ldap/apr_ldap_option.c
Date Mon, 24 Mar 2008 11:45:55 GMT
Author: minfrin
Date: Mon Mar 24 04:45:54 2008
New Revision: 640388

URL: http://svn.apache.org/viewvc?rev=640388&view=rev
Log:
Ensure that the LDAP code can compile cleanly on platforms that do
not define the LDAP_OPT_REFHOPLIMIT symbol, most specifically Windows.

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

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=640388&r1=640387&r2=640388&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Mon Mar 24 04:45:54 2008
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.0
 
+  *) Ensure that the LDAP code can compile cleanly on platforms that do
+     not define the LDAP_OPT_REFHOPLIMIT symbol, most specifically Windows.
+     [Victor <victorjss@gmail.com>, Graham Leggett]
+
   *) Fix the setting of LDAP_OPT_SSL on Win2k, which expects a pointer to
      the value LDAP_OPT_ON, and not the value itself. XP works with both.
      [Victor <victorjss@gmail.com>]

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_option.c?rev=640388&r1=640387&r2=640388&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Mon Mar 24 04:45:54 2008
@@ -160,9 +160,11 @@
         break;
 
     case APR_LDAP_OPT_REFHOPLIMIT:
-#if APR_HAS_OPENLDAP_LDAPSDK
-        /* Setting this option is not supported by current versions of OpenLDAP,
-         * OpenLDAP does support the concept though and defaults to 5.
+#ifndef LDAP_OPT_REFHOPLIMIT
+        /* If the LDAP_OPT_REFHOPLIMIT symbol is missing, assume that the
+         * particular LDAP library has a reasonable default. So far certain
+         * versions of the OpenLDAP SDK miss this symbol (but default to 5),
+         * and the Microsoft SDK misses the symbol (the default is not known).
          */
         result->rc = LDAP_SUCCESS;
 #else



Mime
View raw message