You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bn...@apache.org on 2007/03/13 18:58:29 UTC

svn commit: r517793 - in /apr/apr-util/trunk: build/apu-conf.m4 include/apr_ldap.h.in

Author: bnicholes
Date: Tue Mar 13 10:58:28 2007
New Revision: 517793

URL: http://svn.apache.org/viewvc?view=rev&rev=517793
Log:
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.

Submitted by: David Jones <oscaremma gmail com>


Modified:
    apr/apr-util/trunk/build/apu-conf.m4
    apr/apr-util/trunk/include/apr_ldap.h.in

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?view=diff&rev=517793&r1=517792&r2=517793
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Tue Mar 13 10:58:28 2007
@@ -219,6 +219,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])
@@ -320,6 +321,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
@@ -348,6 +358,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/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.h.in?view=diff&rev=517793&r1=517792&r2=517793
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Tue Mar 13 10:58:28 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.

Re: svn commit: r517793 - in /apr/apr-util/trunk: build/apu-conf.m4 include/apr_ldap.h.in

Posted by "Roy T. Fielding" <fi...@gbiv.com>.
On Mar 13, 2007, at 10:58 AM, bnicholes@apache.org wrote:

> Author: bnicholes
> Date: Tue Mar 13 10:58:28 2007
> New Revision: 517793
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=517793
> Log:
> 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.
>
> Submitted by: David Jones <oscaremma gmail com>
>
>
> Modified:
>     apr/apr-util/trunk/build/apu-conf.m4
>     apr/apr-util/trunk/include/apr_ldap.h.in
>
> Modified: apr/apr-util/trunk/build/apu-conf.m4
> URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu- 
> conf.m4?view=diff&rev=517793&r1=517792&r2=517793
> ====================================================================== 
> ========
> --- apr/apr-util/trunk/build/apu-conf.m4 (original)
> +++ apr/apr-util/trunk/build/apu-conf.m4 Tue Mar 13 10:58:28 2007
> @@ -219,6 +219,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])
> @@ -320,6 +321,15 @@
>                                              
> apr_cv_ldap_toolkit="Mozilla"])
>          fi
>          if test "x$apr_cv_ldap_toolkit" = "x"; then
> +          case "$host" in
> +          *‑ibm‑os390)

That can't be good.  You may need a real text editor.

....Roy