You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2011/05/31 19:11:35 UTC
svn commit: r1129809 - in /apr/apr/trunk: ./ build/ build/rpm/ include/
include/arch/netware/ include/private/ ldap/ misc/netware/ test/
Author: wrowe
Date: Tue May 31 17:11:33 2011
New Revision: 1129809
URL: http://svn.apache.org/viewvc?rev=1129809&view=rev
Log:
Drop the incomplete LDAP abstraction layer from APR 2.0 as decided on-list.
It was not possible to use this interface without ldap provider internals.
Removed:
apr/apr/trunk/build/apu-ldap.m4
apr/apr/trunk/include/apr_ldap.h.in
apr/apr/trunk/include/apr_ldap.hnw
apr/apr/trunk/include/apr_ldap.hw
apr/apr/trunk/include/apr_ldap_init.h
apr/apr/trunk/include/apr_ldap_option.h
apr/apr/trunk/include/apr_ldap_rebind.h
apr/apr/trunk/include/apr_ldap_url.h
apr/apr/trunk/ldap/apr_ldap.dsp
apr/apr/trunk/ldap/apr_ldap_init.c
apr/apr/trunk/ldap/apr_ldap_option.c
apr/apr/trunk/ldap/apr_ldap_rebind.c
apr/apr/trunk/ldap/apr_ldap_stub.c
apr/apr/trunk/ldap/apr_ldap_url.c
apr/apr/trunk/test/testldap.c
Modified:
apr/apr/trunk/CHANGES
apr/apr/trunk/Makefile.in
apr/apr/trunk/README
apr/apr/trunk/SConscript
apr/apr/trunk/STATUS
apr/apr/trunk/apr-config.in
apr/apr/trunk/apr.dsp
apr/apr/trunk/build.conf
apr/apr/trunk/build/aprenv.py
apr/apr/trunk/build/dso.m4
apr/apr/trunk/build/nw_export.h
apr/apr/trunk/build/rpm/apr.spec.in
apr/apr/trunk/configure.in
apr/apr/trunk/include/apr_crypto.h
apr/apr/trunk/include/arch/netware/apr_private.h
apr/apr/trunk/include/private/apu_internal.h
apr/apr/trunk/libapr.dsp
apr/apr/trunk/misc/netware/start.c
apr/apr/trunk/test/Makefile.in
apr/apr/trunk/test/Makefile.win
apr/apr/trunk/test/abts_tests.h
apr/apr/trunk/test/testutil.h
Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Tue May 31 17:11:33 2011
@@ -27,9 +27,6 @@ Changes for APR 2.0.0
pipe in non blocking module through the APR_FOPEN_NONBLOCK flag.
[Graham Leggett]
- *) Enable per-connection LDAP client certificates for
- openldap by requesting a new SSL context. [Eric Covener]
-
*) Support connecttimeout, readtimeout and writetimeout MySQL options
PR 48251 [Marko Kevac <marko kevac.org>]
Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue May 31 17:11:33 2011
@@ -79,7 +79,6 @@ LDADD_dbd_odbc = @LDADD_dbd_odbc@
LDADD_dbm_db = @LDADD_dbm_db@
LDADD_dbm_gdbm = @LDADD_dbm_gdbm@
LDADD_dbm_ndbm = @LDADD_dbm_ndbm@
-LDADD_ldap = @LDADD_ldap@
LDADD_crypto_openssl = @LDADD_crypto_openssl@
LDADD_crypto_nss = @LDADD_crypto_nss@
Modified: apr/apr/trunk/README
URL: http://svn.apache.org/viewvc/apr/apr/trunk/README?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/README (original)
+++ apr/apr/trunk/README Tue May 31 17:11:33 2011
@@ -43,7 +43,6 @@ Apache Portable Runtime Library (APR)
Multiple SQL DBD client interfaces
Multiple flat-database DBM client interfaces
Typesafe function Hooks abstraction
- LDAP SSL connections for a variety of LDAP toolkits
MemCache interface
Date parsing rourtines
Resource Lists
@@ -228,8 +227,6 @@ code and source code.
The following provides more details on the included cryptographic
software:
- APR-Util provides an abstract interface for SSL encrypted LDAP (ldaps
- and STARTTLS style) connections, which can be powered by OpenLDAP,
- Netscape LDAP SDK, Mozilla LDAP SDK, or other platform specific ldap
- interfaces.
+ APR provides an abstract interface for SSL cryptographic functions,
+ specifically @bug XXX Fill This In XXX!
Modified: apr/apr/trunk/SConscript
URL: http://svn.apache.org/viewvc/apr/apr/trunk/SConscript?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/SConscript (original)
+++ apr/apr/trunk/SConscript Tue May 31 17:11:33 2011
@@ -18,7 +18,7 @@ tests = Split("""
testatomic.c testflock.c testsock.c testglobalmutex.c
teststrnatcmp.c testfilecopy.c testtemp.c testlfs.c
testcond.c testuri.c testmemcache.c testdate.c
- testxlate.c testdbd.c testrmm.c testldap.c testmd4.c
+ testxlate.c testdbd.c testrmm.c testmd4.c
teststrmatch.c testpass.c testcrypto.c testqueue.c
testbuckets.c testxml.c testdbm.c testuuid.c testmd5.c
testreslist.c dbd.c
Modified: apr/apr/trunk/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/trunk/STATUS?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/STATUS [utf-8] (original)
+++ apr/apr/trunk/STATUS [utf-8] Tue May 31 17:11:33 2011
@@ -108,10 +108,6 @@ Contributors looking for a mission:
RELEASE SHOWSTOPPERS:
- * Refactor apr_ldap as a proper/complete API. Brownie points for making
- these into DSO pluggable providers against the various SDK's/Toolkits.
- Either re-apply r799085, or drop apr_ldap before 2.0.0, per vote on dev@
-
* apr_file_rotating_* on most platforms
CURRENT VOTES:
Modified: apr/apr/trunk/apr-config.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/apr-config.in?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/apr-config.in (original)
+++ apr/apr/trunk/apr-config.in Tue May 31 17:11:33 2011
@@ -44,7 +44,6 @@ APR_BUILD_DIR="@apr_builddir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
APR_LIBNAME="@APR_LIBNAME@"
-LDAP_LIBS="@LDADD_ldap@"
# NOTE: the following line is modified during 'make install': alter with care!
location=@APR_CONFIG_LOCATION@
@@ -65,7 +64,6 @@ Known values for OPTION are:
--includes print include information
--ldflags print linker flags
--libs print additional libraries to link against
- --ldap-libs print additional library information to link with ldap
--srcdir print APR source directory
--installbuilddir print APR build helper directory
--link-ld print link switch(es) for linking to APR
@@ -150,9 +148,6 @@ while test $# -gt 0; do
--libs)
flags="$flags $LIBS"
;;
- --ldap-libs)
- flags="$flags $LDAP_LIBS"
- ;;
--ldflags)
flags="$flags $LDFLAGS"
;;
Modified: apr/apr/trunk/apr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/apr.dsp?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/apr.dsp (original)
+++ apr/apr/trunk/apr.dsp Tue May 31 17:11:33 2011
@@ -374,30 +374,6 @@ SOURCE=.\file_io\unix\tempdir.c
SOURCE=.\hooks\apr_hooks.c
# End Source File
# End Group
-# Begin Group "ldap"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_rebind.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_stub.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_url.c
-# End Source File
-# End Group
# Begin Group "locks"
# PROP Default_Filter ""
@@ -934,61 +910,6 @@ SOURCE=.\include\apr_inherit.h
# End Source File
# Begin Source File
-SOURCE=.\include\apr_ldap.h.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ldap.hnw
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ldap.hw
-
-!IF "$(CFG)" == "apr - Win32 Release"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - Win32 Debug"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - x64 Release"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - x64 Debug"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\include\apr_lib.h
# End Source File
# Begin Source File
Modified: apr/apr/trunk/build.conf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build.conf?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/build.conf (original)
+++ apr/apr/trunk/build.conf Tue May 31 17:11:33 2011
@@ -21,8 +21,6 @@ paths =
dbm/sdbm/*.c
encoding/*.c
hooks/*.c
- ldap/apr_ldap_stub.c
- ldap/apr_ldap_url.c
misc/*.c
memcache/*.c
uri/apr_uri.c
@@ -51,7 +49,7 @@ headers = include/*.h
dsp = libapr.dsp
modules =
- ldap crypto_openssl crypto_nss dbd_pgsql
+ crypto_openssl crypto_nss dbd_pgsql
dbd_sqlite2 dbd_sqlite3 dbd_oracle dbd_mysql dbd_freetds dbd_odbc
dbm_db dbm_gdbm dbm_ndbm
@@ -108,9 +106,3 @@ target = dbm/apr_dbm_gdbm.la
paths = dbm/apr_dbm_ndbm.c
target = dbm/apr_dbm_ndbm.la
-[ldap]
-paths = ldap/apr_ldap_init.c
- ldap/apr_ldap_option.c
- ldap/apr_ldap_rebind.c
-target = ldap/apr_ldap.la
-
Modified: apr/apr/trunk/build/aprenv.py
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/aprenv.py?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/build/aprenv.py (original)
+++ apr/apr/trunk/build/aprenv.py Tue May 31 17:11:33 2011
@@ -683,22 +683,8 @@ class APREnv(Environment):
subst['@have_iconv@'] = 0
- # ldap stuff, remove soon.
- subst['@apu_has_ldap@'] = 0
-
- subst['@apu_has_ldap_netscape@'] = 0
- subst['@apu_has_ldap_solaris@'] = 0
- subst['@apu_has_ldap_novell@'] = 0
- subst['@apu_has_ldap_mozilla@'] = 0
- subst['@apu_has_ldap_openldap@'] = 0
- subst['@apu_has_ldap_microsoft@'] = 0
- subst['@apu_has_ldap_tivoli@'] = 0
- subst['@apu_has_ldap_zos@'] = 0
- subst['@apu_has_ldap_other@'] = 0
-
self.SubstFile('include/apr.h', 'include/apr.h.in', SUBST_DICT = subst)
self.SubstFile('include/apu.h', 'include/apu.h.in', SUBST_DICT = subst)
- self.SubstFile('include/apr_ldap.h', 'include/apr_ldap.h.in', SUBST_DICT = subst)
self.SubstFile('include/apu_want.h', 'include/apu_want.h.in', SUBST_DICT = subst)
self.SubstFile('include/private/apu_select_dbm.h', 'include/private/apu_select_dbm.h.in', SUBST_DICT = subst)
if hasattr(conf, "config_h_text"):
Modified: apr/apr/trunk/build/dso.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dso.m4?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/build/dso.m4 (original)
+++ apr/apr/trunk/build/dso.m4 Tue May 31 17:11:33 2011
@@ -46,9 +46,6 @@ AC_DEFUN([APR_MODULAR_DSO], [
test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
- test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
- test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
- test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
# Use libtool *.la for mysql if available
@@ -68,11 +65,9 @@ AC_DEFUN([APR_MODULAR_DSO], [
LIBS="$LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
LIBS="$LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
LIBS="$LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
- LIBS="$LIBS $LDADD_ldap"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
- APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
else
@@ -90,7 +85,6 @@ AC_DEFUN([APR_MODULAR_DSO], [
test $apu_have_db = 1 && dsos="$dsos dbm/apr_dbm_db.la"
test $apu_have_gdbm = 1 && dsos="$dsos dbm/apr_dbm_gdbm.la"
test $apu_have_ndbm = 1 && dsos="$dsos dbm/apr_dbm_ndbm.la"
- test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
if test -n "$dsos"; then
APR_DSO_MODULES="$APR_DSO_MODULES $dsos"
Modified: apr/apr/trunk/build/nw_export.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.h (original)
+++ apr/apr/trunk/build/nw_export.h Tue May 31 17:11:33 2011
@@ -31,11 +31,6 @@
#include "apr_hash.h"
#include "apr_hooks.h"
#include "apr_inherit.h"
-#include "apr_ldap.h"
-#include "apr_ldap_init.h"
-#include "apr_ldap_option.h"
-#include "apr_ldap_rebind.h"
-#include "apr_ldap_url.h"
#include "apr_lib.h"
#include "apr_md4.h"
#include "apr_md5.h"
Modified: apr/apr/trunk/build/rpm/apr.spec.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/rpm/apr.spec.in?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/build/rpm/apr.spec.in (original)
+++ apr/apr/trunk/build/rpm/apr.spec.in Tue May 31 17:11:33 2011
@@ -88,15 +88,6 @@ Requires: apr-util = %{version}-%{releas
This package provides the ODBC driver for the apr-util DBD
(database abstraction) interface.
-%package ldap
-Group: Development/Libraries
-Summary: APR utility library LDAP support
-BuildRequires: openldap-devel
-Requires: apr-util = %{version}-%{release}
-
-%description ldap
-This package provides the LDAP support for the apr-util.
-
%package openssl
Group: Development/Libraries
Summary: APR utility library OpenSSL crypto support
@@ -126,7 +117,7 @@ This package provides crypto support for
--includedir=%{_includedir}/apr-%{aprver} \
--with-installbuilddir=%{_libdir}/apr/build-%{aprver} \
--with-devrandom=/dev/urandom \
- --with-ldap --without-gdbm \
+ --without-gdbm \
--with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
--with-berkeley-db \
--with-crypto --with-openssl --with-nss \
@@ -188,10 +179,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/apr-%{aprver}/apr_dbd_odbc*
-%files ldap
-%defattr(-,root,root,-)
-%{_libdir}/apr-%{aprver}/apr_ldap*
-
%files openssl
%defattr(-,root,root,-)
%{_libdir}/apr-%{aprver}/apr_crypto_openssl*
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue May 31 17:11:33 2011
@@ -27,7 +27,6 @@ sinclude(build/ltversion.m4)
sinclude(build/lt~obsolete.m4)
sinclude(build/apu-conf.m4)
-sinclude(build/apu-ldap.m4)
sinclude(build/xml.m4)
sinclude(build/apu-hints.m4)
sinclude(build/crypto.m4)
@@ -2608,9 +2607,6 @@ APU_CHECK_CRYPTO
APU_CHECK_CRYPTO_OPENSSL
APU_CHECK_CRYPTO_NSS
-dnl Find LDAP library
-APU_FIND_LDAP
-
dnl Find DBM and DBD backends to use.
APU_CHECK_DBM
APU_CHECK_DBD
@@ -2667,7 +2663,6 @@ AC_SUBST(EXTRA_OBJECTS)
dnl XXX FIXME; used for -lexpat, -liconv etc?
AC_SUBST(APRUTIL_EXPORT_LIBS)
-
dnl
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
@@ -2749,7 +2744,6 @@ if test -d $srcdir/test; then
fi
AC_CONFIG_FILES([include/private/apu_select_dbm.h
- include/apr_ldap.h
include/apu_want.h])
dir=include/arch/unix
Modified: apr/apr/trunk/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_crypto.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_crypto.h (original)
+++ apr/apr/trunk/include/apr_crypto.h Tue May 31 17:11:33 2011
@@ -162,9 +162,7 @@ typedef enum {
* Certificate and private key structure.
*
* The various crypto backends expect certificates and keys in a wide
- * array of formats. This structure is analogous to apr_ldap_opt_tls_cert_t
- * from the LDAP interface. Ultimately that interface should be meshed with
- * this one.
+ * array of formats.
* @param type Type of certificate APR_CRYPTO_*_TYPE_*
* @param path Path, file or nickname of the certificate
* @param password Optional password, can be NULL
Modified: apr/apr/trunk/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/netware/apr_private.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/netware/apr_private.h (original)
+++ apr/apr/trunk/include/arch/netware/apr_private.h Tue May 31 17:11:33 2011
@@ -155,7 +155,6 @@ typedef struct app_data {
rtag_t gs_lookup_rtag;
rtag_t gs_event_rtag;
rtag_t gs_pcp_rtag;
- void* gs_ldap_xref_lock;
void* gs_xref_head;
} APP_DATA;
Modified: apr/apr/trunk/include/private/apu_internal.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apu_internal.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/include/private/apu_internal.h (original)
+++ apr/apr/trunk/include/private/apu_internal.h Tue May 31 17:11:33 2011
@@ -17,7 +17,6 @@
#include "apr.h"
#include "apr_dso.h"
#include "apu.h"
-#include "apr_ldap.h"
#ifndef APU_INTERNAL_H
#define APU_INTERNAL_H
@@ -38,31 +37,9 @@ apr_status_t apu_dso_init(apr_pool_t *po
apr_status_t apu_dso_mutex_lock(void);
apr_status_t apu_dso_mutex_unlock(void);
-apr_status_t apu_dso_load(apr_dso_handle_t **dso, apr_dso_handle_sym_t *dsoptr, const char *module,
- const char *modsym, apr_pool_t *pool);
-
-#if APR_HAS_LDAP
-
-/* For LDAP internal builds, wrap our LDAP namespace */
-
-struct apr__ldap_dso_fntable {
- int (*info)(apr_pool_t *pool, apr_ldap_err_t **result_err);
- int (*init)(apr_pool_t *pool, LDAP **ldap, const char *hostname,
- int portno, int secure, apr_ldap_err_t **result_err);
- int (*ssl_init)(apr_pool_t *pool, const char *cert_auth_file,
- int cert_file_type, apr_ldap_err_t **result_err);
- int (*ssl_deinit)(void);
- int (*get_option)(apr_pool_t *pool, LDAP *ldap, int option,
- void *outvalue, apr_ldap_err_t **result_err);
- int (*set_option)(apr_pool_t *pool, LDAP *ldap, int option,
- const void *invalue, apr_ldap_err_t **result_err);
- apr_status_t (*rebind_init)(apr_pool_t *pool);
- apr_status_t (*rebind_add)(apr_pool_t *pool, LDAP *ld,
- const char *bindDN, const char *bindPW);
- apr_status_t (*rebind_remove)(LDAP *ld);
-};
-
-#endif /* APR_HAS_LDAP */
+apr_status_t apu_dso_load(apr_dso_handle_t **dso, apr_dso_handle_sym_t *dsoptr,
+ const char *module, const char *modsym,
+ apr_pool_t *pool);
#ifdef __cplusplus
}
Modified: apr/apr/trunk/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.dsp?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/libapr.dsp (original)
+++ apr/apr/trunk/libapr.dsp Tue May 31 17:11:33 2011
@@ -409,30 +409,6 @@ SOURCE=.\file_io\unix\tempdir.c
SOURCE=.\hooks\apr_hooks.c
# End Source File
# End Group
-# Begin Group "ldap"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_rebind.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_stub.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap\apr_ldap_url.c
-# End Source File
-# End Group
# Begin Group "locks"
# PROP Default_Filter ""
@@ -969,61 +945,6 @@ SOURCE=.\include\apr_inherit.h
# End Source File
# Begin Source File
-SOURCE=.\include\apr_ldap.h.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ldap.hnw
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ldap.hw
-
-!IF "$(CFG)" == "libapr - Win32 Release"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "libapr - Win32 Debug"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "libapr - x64 Release"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "libapr - x64 Debug"
-
-# Begin Custom Build - Creating apr_ldap.h from apr_ldap.hw
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr_ldap.hw > .\include\apr_ldap.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\include\apr_lib.h
# End Source File
# Begin Source File
Modified: apr/apr/trunk/misc/netware/start.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/netware/start.c?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/misc/netware/start.c (original)
+++ apr/apr/trunk/misc/netware/start.c Tue May 31 17:11:33 2011
@@ -22,7 +22,6 @@
#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */
#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
#include "apr_arch_internal_time.h"
-#include "apr_ldap.h" /* for apr_ldap_rebind_init() */
#ifdef USE_WINSOCK
/* Prototypes missing from older NDKs */
@@ -163,9 +162,6 @@ APR_DECLARE(apr_status_t) apr_initialize
#endif
apr_signal_init(pool);
-#if APR_HAS_LDAP
- apr_ldap_rebind_init(pool);
-#endif
return APR_SUCCESS;
}
Modified: apr/apr/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.in?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.in (original)
+++ apr/apr/trunk/test/Makefile.in Tue May 31 17:11:33 2011
@@ -31,7 +31,7 @@ TESTS = testtime.lo teststr.lo testvsn.l
testatomic.lo testflock.lo testsock.lo testglobalmutex.lo \
teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo \
testcond.lo testuri.lo testmemcache.lo testdate.lo \
- testxlate.lo testdbd.lo testrmm.lo testldap.lo testmd4.lo \
+ testxlate.lo testdbd.lo testrmm.lo testmd4.lo \
teststrmatch.lo testpass.lo testcrypto.lo testqueue.lo \
testbuckets.lo testxml.lo testdbm.lo testuuid.lo testmd5.lo \
testreslist.lo testbase64.lo testhooks.lo testlfsabi.lo \
@@ -87,7 +87,7 @@ testutil.lo: $(srcdir)/abts.c $(srcdir)/
OBJECTS_testall = abts.lo testutil.lo $(TESTS) $(LOCAL_LIBS)
testall@EXEEXT@: $(OBJECTS_testall)
- $(LINK_PROG) $(OBJECTS_testall) $(ALL_LIBS) @LDADD_ldap@
+ $(LINK_PROG) $(OBJECTS_testall) $(ALL_LIBS)
# For VPATH builds; where we have no ./data, copy us some data
# if we wait until 'make check', then 'make; ./testall' fails;
if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
@@ -176,7 +176,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_P
if test "$$prog" = 'dbd'; then \
for driver in none @apu_dbd_tests@; do \
if test "$$driver" != 'none'; then \
- @shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
+ @shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
./$$prog $$driver; \
status=$$?; \
if test $$status != 0; then \
@@ -186,7 +186,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_P
fi; \
done; \
else \
- @shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
+ @shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
./$$prog; \
status=$$?; \
if test $$status != 0; then \
Modified: apr/apr/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.win?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.win (original)
+++ apr/apr/trunk/test/Makefile.win Tue May 31 17:11:33 2011
@@ -101,7 +101,6 @@ ALL_TESTS = \
$(INTDIR)\testhash.obj \
$(INTDIR)\testhooks.obj \
$(INTDIR)\testipsub.obj \
- $(INTDIR)\testldap.obj \
$(INTDIR)\testlfs.obj \
$(INTDIR)\testlfsabi.obj \
$(INTDIR)\testlfsabi32.obj \
Modified: apr/apr/trunk/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/abts_tests.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/test/abts_tests.h (original)
+++ apr/apr/trunk/test/abts_tests.h Tue May 31 17:11:33 2011
@@ -77,7 +77,6 @@ const struct testlist {
{testmd4},
{testmd5},
{testcrypto},
- {testldap},
{testdbd},
{testdate},
{testmemcache},
Modified: apr/apr/trunk/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testutil.h?rev=1129809&r1=1129808&r2=1129809&view=diff
==============================================================================
--- apr/apr/trunk/test/testutil.h (original)
+++ apr/apr/trunk/test/testutil.h Tue May 31 17:11:33 2011
@@ -113,7 +113,6 @@ abts_suite *testbase64(abts_suite *suite
abts_suite *testmd4(abts_suite *suite);
abts_suite *testmd5(abts_suite *suite);
abts_suite *testcrypto(abts_suite *suite);
-abts_suite *testldap(abts_suite *suite);
abts_suite *testdbd(abts_suite *suite);
abts_suite *testdate(abts_suite *suite);
abts_suite *testmemcache(abts_suite *suite);
Crypto README notice, please!
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 5/31/2011 12:11 PM, wrowe@apache.org wrote:
>
> Modified: apr/apr/trunk/README
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/README?rev=1129809&r1=1129808&r2=1129809&view=diff
> ==============================================================================
> --- apr/apr/trunk/README (original)
> +++ apr/apr/trunk/README Tue May 31 17:11:33 2011
> @@ -228,8 +227,6 @@ code and source code.
> The following provides more details on the included cryptographic
> software:
>
> - APR-Util provides an abstract interface for SSL encrypted LDAP (ldaps
> - and STARTTLS style) connections, which can be powered by OpenLDAP,
> - Netscape LDAP SDK, Mozilla LDAP SDK, or other platform specific ldap
> - interfaces.
> + APR provides an abstract interface for SSL cryptographic functions,
> + specifically @bug XXX Fill This In XXX!
This shows up a large problem. Would the apr_crypto_* advocates please
update README to comply with the ASF crypto policy (notably, bullet 4)
per http://www.apache.org/dev/crypto.html ? As we prepare to release
either apr-util-1.4(5?) or apr-2.0, we will be filing a TSU exception
notice, which Jeff or I can deal with.