apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r595268 - in /apr/apr-util/branches/1.2.x: CHANGES build/apu-conf.m4 include/apr_ldap.h.in include/apr_ldap.hw
Date Thu, 15 Nov 2007 11:24:40 GMT
Author: davi
Date: Thu Nov 15 03:24:36 2007
New Revision: 595268

URL: http://svn.apache.org/viewvc?rev=595268&view=rev
Log:
Backport r517793 and r586077 from trunk.

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/build/apu-conf.m4
    apr/apr-util/branches/1.2.x/include/apr_ldap.h.in
    apr/apr-util/branches/1.2.x/include/apr_ldap.hw

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?rev=595268&r1=595267&r2=595268&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.2.x/CHANGES [utf-8] Thu Nov 15 03:24:36 2007
@@ -6,6 +6,11 @@
      yield a corrupt apr_datum_t when reading from a GDBM database.
      PR 43025.  [Björn Wiberg <Bjorn.Wiberg its.uu.se>, Davi Arnaut]
 
+  *) Add the #define APR_LDAP_SIZELIMIT that is set appropriately
+     for the LDAP SDK that is being used. Also include ZOS as an
+     LDAP Platform.
+     PR 37814.  [David Jones <oscaremma gmail com>, Davi Arnaut]
+
 Changes with APR-util 1.2.11
 
   *) Fix exported LDFLAGS with new expat detection.  PR 43337.

Modified: apr/apr-util/branches/1.2.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/apu-conf.m4?rev=595268&r1=595267&r2=595268&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/apu-conf.m4 Thu Nov 15 03:24:36 2007
@@ -227,6 +227,7 @@
 apu_has_ldap_microsoft="0"
 apu_has_ldap_netscape="0"
 apu_has_ldap_mozilla="0"
+apu_has_ldap_zos="0"
 apu_has_ldap_other="0"
 
 AC_ARG_WITH(ldap-include,[  --with-ldap-include=path  path to ldap include files with trailing
slash])
@@ -328,6 +329,15 @@
                                            apr_cv_ldap_toolkit="Mozilla"])
         fi
         if test "x$apr_cv_ldap_toolkit" = "x"; then
+          case "$host" in
+          *‑ibm‑os390)
+            AC_EGREP_CPP([IBM], [$lber_h
+                                 $ldap_h], [apu_has_ldap_zos="1"
+                                            apr_cv_ldap_toolkit="zOS"])
+            ;;
+          esac
+        fi
+        if test "x$apr_cv_ldap_toolkit" = "x"; then
           apu_has_ldap_other="1"
           apr_cv_ldap_toolkit="unknown"
         fi
@@ -356,6 +366,7 @@
 AC_SUBST(apu_has_ldap_microsoft)
 AC_SUBST(apu_has_ldap_netscape)
 AC_SUBST(apu_has_ldap_mozilla)
+AC_SUBST(apu_has_ldap_zos)
 AC_SUBST(apu_has_ldap_other)
 
 ])

Modified: apr/apr-util/branches/1.2.x/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apr_ldap.h.in?rev=595268&r1=595267&r2=595268&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apr_ldap.h.in (original)
+++ apr/apr-util/branches/1.2.x/include/apr_ldap.h.in Thu Nov 15 03:24:36 2007
@@ -40,6 +40,7 @@
 #define APR_HAS_MOZILLA_LDAPSDK   @apu_has_ldap_mozilla@
 #define APR_HAS_OPENLDAP_LDAPSDK  @apu_has_ldap_openldap@
 #define APR_HAS_MICROSOFT_LDAPSDK @apu_has_ldap_microsoft@
+#define APR_HAS_ZOS_LDAPSDK       @apu_has_ldap_zos@
 #define APR_HAS_OTHER_LDAPSDK     @apu_has_ldap_other@
 
 
@@ -93,6 +94,29 @@
 #define LDAPS_PORT 636  /* ldaps:/// default LDAP over TLS port */
 #endif
 
+/*
+ * For ldap function calls that input a size limit on the number of returned elements
+ * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (‑1) or LDAP_NO_LIMIT (0)
+ */
+#if APR_HAS_ZOS_LDAPSDK
+#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
+#else
+#ifdef LDAP_DEFAULT_LIMIT
+#define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT
+#else
+#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */
+#endif
+#endif
+
+/*
+ * z/OS is missing some defines
+ */
+#ifndef LDAP_VERSION_MAX
+#define LDAP_VERSION_MAX  LDAP_VERSION
+#endif
+#if APR_HAS_ZOS_LDAPSDK
+#define LDAP_VENDOR_NAME "IBM z/OS"
+#endif
 
 /* Note: Macros defining const casting has been removed in APR v1.0,
  * pending real support for LDAP v2.0 toolkits.

Modified: apr/apr-util/branches/1.2.x/include/apr_ldap.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apr_ldap.hw?rev=595268&r1=595267&r2=595268&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apr_ldap.hw (original)
+++ apr/apr-util/branches/1.2.x/include/apr_ldap.hw Thu Nov 15 03:24:36 2007
@@ -87,6 +87,13 @@
 #endif
 
 
+/*
+ * For ldap function calls that input a size limit on the number of returned elements
+ * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
+ */
+#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
+
+
 /* Note: Macros defining const casting has been removed in APR v1.0,
  * pending real support for LDAP v2.0 toolkits.
  *



Mime
View raw message