On Fri, Jan 21, 2005 at 02:53:54PM -0000, Graham Leggett wrote: > Author: minfrin > Date: Fri Jan 21 06:53:53 2005 > New Revision: 125933 > > URL: http://svn.apache.org/viewcvs?view=rev&rev=125933 > Log: > > The Mozilla SDK has a different vendor string to the Netscape and > Solaris SDK, but works the same way. Install proper detection of the > ldapssl_install_routines function, which is present on some Solaris > toolkits but not others.
APR_HAS_LDAPSSL_INSTALL_ROUTINES does not look like it needs to be exported via apr_ldap.h, so it should just be flagged in apu_config.h using: AC_DEFINE(HAVE_LDAPSSL_INSTALL_ROUTINES, 1, [Defined if...]) ...nothing that can be kept private should be exported in the API, especially not in a 1.x.y branch. joe > > Modified: > apr/apr-util/trunk/build/apu-conf.m4 > apr/apr-util/trunk/include/apr_ldap.h.in > apr/apr-util/trunk/include/apr_ldap.hnw > apr/apr-util/trunk/include/apr_ldap.hw > apr/apr-util/trunk/ldap/apr_ldap_option.c > > Modified: apr/apr-util/trunk/build/apu-conf.m4 > Url: > http://svn.apache.org/viewcvs/apr/apr-util/trunk/build/apu-conf.m4?view=diff&rev=125933&p1=apr/apr-util/trunk/build/apu-conf.m4&r1=125932&p2=apr/apr-util/trunk/build/apu-conf.m4&r2=125933 > ============================================================================== > --- apr/apr-util/trunk/build/apu-conf.m4 (original) > +++ apr/apr-util/trunk/build/apu-conf.m4 Fri Jan 21 06:53:53 2005 > @@ -222,10 +222,9 @@ > AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, > apu_has_ldapssl_client_deinit="1", , ${extralib}) > AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, > apu_has_ldapssl_add_trusted_cert="1", , ${extralib}) > AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, > apu_has_ldap_start_tls_s="1", , ${extralib}) > - AC_CHECK_LIB(${ldaplib}, ldap_sslinit, apu_has_ldap_sslinit="1", , > -${extralib}) > - AC_CHECK_LIB(${ldaplib}, ldapssl_init, apu_has_ldapssl_init="1", , > > -${extralib}) > + AC_CHECK_LIB(${ldaplib}, ldap_sslinit, apu_has_ldap_sslinit="1", , > ${extralib}) > + AC_CHECK_LIB(${ldaplib}, ldapssl_init, apu_has_ldapssl_init="1", , > ${extralib}) > + AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, > apu_has_ldapssl_install_routines="1", , ${extralib}) > apu_has_ldap="1"; > ], , ${extralib}) > fi > @@ -246,11 +245,13 @@ > apu_has_ldap_start_tls_s="0" > apu_has_ldapssl_init="0" > apu_has_ldap_sslinit="0" > +apu_has_ldapssl_install_routines="0" > apu_has_ldap_openldap="0" > apu_has_ldap_solaris="0" > apu_has_ldap_novell="0" > apu_has_ldap_microsoft="0" > apu_has_ldap_netscape="0" > +apu_has_ldap_mozilla="0" > apu_has_ldap_other="0" > > AC_ARG_WITH(ldap-include,[ --with-ldap-include=path path to ldap include > files with trailing slash]) > @@ -344,6 +345,12 @@ > apr_cv_ldap_toolkit="Netscape"]) > fi > if test "x$apr_cv_ldap_toolkit" = "x"; then > + AC_EGREP_CPP([mozilla.org], [$lber_h > + $ldap_h > + LDAP_VENDOR_NAME], [apu_has_ldap_mozilla="1" > + apr_cv_ldap_toolkit="Mozilla"]) > + fi > + if test "x$apr_cv_ldap_toolkit" = "x"; then > apu_has_ldap_other="1" > apr_cv_ldap_toolkit="unknown" > fi > @@ -364,12 +371,14 @@ > AC_SUBST(apu_has_ldap_start_tls_s) > AC_SUBST(apu_has_ldapssl_init) > AC_SUBST(apu_has_ldap_sslinit) > +AC_SUBST(apu_has_ldapssl_install_routines) > AC_SUBST(apu_has_ldap) > AC_SUBST(apu_has_ldap_openldap) > AC_SUBST(apu_has_ldap_solaris) > AC_SUBST(apu_has_ldap_novell) > AC_SUBST(apu_has_ldap_microsoft) > AC_SUBST(apu_has_ldap_netscape) > +AC_SUBST(apu_has_ldap_mozilla) > AC_SUBST(apu_has_ldap_other) > > ]) > > Modified: apr/apr-util/trunk/include/apr_ldap.h.in > Url: > http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.h.in?view=diff&rev=125933&p1=apr/apr-util/trunk/include/apr_ldap.h.in&r1=125932&p2=apr/apr-util/trunk/include/apr_ldap.h.in&r2=125933 > ============================================================================== > --- apr/apr-util/trunk/include/apr_ldap.h.in (original) > +++ apr/apr-util/trunk/include/apr_ldap.h.in Fri Jan 21 06:53:53 2005 > @@ -36,6 +36,7 @@ > #define APR_HAS_NETSCAPE_LDAPSDK @apu_has_ldap_netscape@ > #define APR_HAS_SOLARIS_LDAPSDK @apu_has_ldap_solaris@ > #define APR_HAS_NOVELL_LDAPSDK @apu_has_ldap_novell@ > +#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_OTHER_LDAPSDK @apu_has_ldap_other@ > @@ -76,6 +77,7 @@ > #define APR_HAS_LDAP_START_TLS_S @apu_has_ldap_start_tls_s@ > #define APR_HAS_LDAP_SSLINIT @apu_has_ldap_sslinit@ > #define APR_HAS_LDAPSSL_INIT @apu_has_ldapssl_init@ > +#define APR_HAS_LDAPSSL_INSTALL_ROUTINES @apu_has_ldapssl_install_routines@ > > /* > * Make sure the secure LDAP port is defined > > Modified: apr/apr-util/trunk/include/apr_ldap.hnw > Url: > http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hnw?view=diff&rev=125933&p1=apr/apr-util/trunk/include/apr_ldap.hnw&r1=125932&p2=apr/apr-util/trunk/include/apr_ldap.hnw&r2=125933 > ============================================================================== > --- apr/apr-util/trunk/include/apr_ldap.hnw (original) > +++ apr/apr-util/trunk/include/apr_ldap.hnw Fri Jan 21 06:53:53 2005 > @@ -36,6 +36,7 @@ > #define APR_HAS_NETSCAPE_LDAPSDK 0 > #define APR_HAS_SOLARIS_LDAPSDK 0 > #define APR_HAS_NOVELL_LDAPSDK 1 > +#define APR_HAS_MOZILLA_LDAPSDK 0 > #define APR_HAS_OPENLDAP_LDAPSDK 0 > #define APR_HAS_MICROSOFT_LDAPSDK 0 > #define APR_HAS_OTHER_LDAPSDK 0 > @@ -78,6 +79,7 @@ > #define APR_HAS_LDAP_START_TLS_S 0 > #define APR_HAS_LDAP_SSLINIT 0 > #define APR_HAS_LDAPSSL_INIT 1 > +#define APR_HAS_LDAPSSL_INSTALL_ROUTINES 0 > > > /* > > Modified: apr/apr-util/trunk/include/apr_ldap.hw > Url: > http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hw?view=diff&rev=125933&p1=apr/apr-util/trunk/include/apr_ldap.hw&r1=125932&p2=apr/apr-util/trunk/include/apr_ldap.hw&r2=125933 > ============================================================================== > --- apr/apr-util/trunk/include/apr_ldap.hw (original) > +++ apr/apr-util/trunk/include/apr_ldap.hw Fri Jan 21 06:53:53 2005 > @@ -36,6 +36,7 @@ > #define APR_HAS_NETSCAPE_LDAPSDK 0 > #define APR_HAS_SOLARIS_LDAPSDK 0 > #define APR_HAS_NOVELL_LDAPSDK 0 > +#define APR_HAS_MOZILLA_LDAPSDK 0 > #define APR_HAS_OPENLDAP_LDAPSDK 0 > #define APR_HAS_MICROSOFT_LDAPSDK 1 > #define APR_HAS_OTHER_LDAPSDK 0 > @@ -74,12 +75,8 @@ > #define APR_HAS_LDAP_START_TLS_S 0 > #define APR_HAS_LDAP_SSLINIT 1 > #define APR_HAS_LDAPSSL_INIT 0 > +#define APR_HAS_LDAPSSL_INSTALL_ROUTINES 0 > > -/* > - * On Windows, ldap_start_tls_s is defined with 5 parameters instead > - * of the standard 3. > - */ > -#define APR_HAS_LDAP_START_TLS_S5 1 > > /* > * Make sure the secure LDAP port is defined > > 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=125933&p1=apr/apr-util/trunk/ldap/apr_ldap_option.c&r1=125932&p2=apr/apr-util/trunk/ldap/apr_ldap_option.c&r2=125933 > ============================================================================== > --- apr/apr-util/trunk/ldap/apr_ldap_option.c (original) > +++ apr/apr-util/trunk/ldap/apr_ldap_option.c Fri Jan 21 06:53:53 2005 > @@ -141,8 +141,8 @@ > #if APR_HAS_LDAP_SSL /* compiled with ssl support */ > > /* Netscape/Mozilla/Solaris SDK */ > -#if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK > -#ifdef LDAP_OPT_SSL > +#if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || > APR_HAS_MOZILLA_LDAPSK > +#if APR_HAS_LDAPSSL_INSTALL_ROUTINES > if (tls == APR_LDAP_SSL) { > result->rc = ldapssl_install_routines(ldap); > if (result->rc == LDAP_SUCCESS) { > @@ -309,7 +309,7 @@ > #if APR_HAS_LDAP_SSL > > /* Netscape/Mozilla/Solaris SDK */ > -#if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK > +#if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || > APR_HAS_MOZILLA_LDAPSDK > #if APR_HAS_LDAPSSL_CLIENT_INIT > const char *nickname = NULL; > const char *secmod = NULL;
