From: Ralf Haferkamp Date: Thu, 15 Mar 2001 11:07:58 +0000 (+0000) Subject: - Fixed some memory leak detected by Jeff Costlow X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1480 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1957678d4fb82f5bb2af228606785bb49522fcc;p=openldap - Fixed some memory leak detected by Jeff Costlow - Fixed some trouble time.h / sys/time.h - modified include statements --- diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in index e2c7795a30..cd0d17c9e1 100644 --- a/contrib/ldapc++/Makefile.in +++ b/contrib/ldapc++/Makefile.in @@ -80,10 +80,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README AUTHORS INSTALL Makefile.am Makefile.in TODO \ -acconfig.h aclocal.m4 config.guess config.sub configure configure.in \ -install-sh ltconfig ltmain.sh missing mkinstalldirs src/config.h.in \ -src/stamp-h.in +DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO acconfig.h \ +aclocal.m4 config.guess config.sub configure configure.in install-sh \ +ltconfig ltmain.sh missing mkinstalldirs src/config.h.in src/stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/contrib/ldapc++/aclocal.m4 b/contrib/ldapc++/aclocal.m4 index 228d0f5e8b..f2a44c4271 100644 --- a/contrib/ldapc++/aclocal.m4 +++ b/contrib/ldapc++/aclocal.m4 @@ -476,31 +476,35 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library, adds --enable-ltdl-convenience to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. +# the libltdl convenience library and INCLTDL to the include flags for +# the libltdl header and adds --enable-ltdl-convenience to the +# configure arguments. Note that LIBLTDL and INCLTDL are not +# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not +# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed +# with '${top_builddir}/' and INCLTDL will be prefixed with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la + INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library, and adds --enable-ltdl-install to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. +# the libltdl installable library and INCLTDL to the include flags for +# the libltdl header and adds --enable-ltdl-install to the configure +# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed +# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will +# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +# with '${top_srcdir}/' (note the single quotes!). If your package is +# not flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, @@ -513,8 +517,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la + INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" diff --git a/contrib/ldapc++/src/LDAPAddRequest.h b/contrib/ldapc++/src/LDAPAddRequest.h index c8db2c1925..686f1c6f0c 100644 --- a/contrib/ldapc++/src/LDAPAddRequest.h +++ b/contrib/ldapc++/src/LDAPAddRequest.h @@ -6,8 +6,8 @@ #ifndef LDAP_ADD_REQUEST_H #define LDAP_ADD_REQUEST_H -#include "LDAPRequest.h" -#include "LDAPEntry.h" +#include +#include class LDAPMessageQueue; diff --git a/contrib/ldapc++/src/LDAPAsynConnection.cpp b/contrib/ldapc++/src/LDAPAsynConnection.cpp index 9638717a0f..d422dff332 100644 --- a/contrib/ldapc++/src/LDAPAsynConnection.cpp +++ b/contrib/ldapc++/src/LDAPAsynConnection.cpp @@ -36,6 +36,7 @@ LDAPAsynConnection::LDAPAsynConnection(const string& hostname, int port, LDAPAsynConnection::~LDAPAsynConnection(){ DEBUG(LDAP_DEBUG_DESTROY, "LDAPAsynConnection::~LDAPAsynConnection()" << endl); + delete m_constr; unbind(); } diff --git a/contrib/ldapc++/src/LDAPAsynConnection.h b/contrib/ldapc++/src/LDAPAsynConnection.h index 43c2b46263..899af2d15d 100644 --- a/contrib/ldapc++/src/LDAPAsynConnection.h +++ b/contrib/ldapc++/src/LDAPAsynConnection.h @@ -13,12 +13,12 @@ #include #include -#include "LDAPMessageQueue.h" -#include "LDAPConstraints.h" -#include "LDAPModification.h" -#include "LDAPModList.h" -#include "LDAPUrl.h" -#include "LDAPUrlList.h" +#include +#include +#include +#include +#include +#include class LDAPEntry; class LDAPAttribute; diff --git a/contrib/ldapc++/src/LDAPAttribute.h b/contrib/ldapc++/src/LDAPAttribute.h index 82b12324a3..ed191056bd 100644 --- a/contrib/ldapc++/src/LDAPAttribute.h +++ b/contrib/ldapc++/src/LDAPAttribute.h @@ -12,7 +12,7 @@ #include #include -#include "StringList.h" +#include /** * Represents the name an value(s) of an Attribute diff --git a/contrib/ldapc++/src/LDAPAttributeList.h b/contrib/ldapc++/src/LDAPAttributeList.h index 8161293364..5cbe8f55f4 100644 --- a/contrib/ldapc++/src/LDAPAttributeList.h +++ b/contrib/ldapc++/src/LDAPAttributeList.h @@ -18,12 +18,12 @@ typedef list AttrList; * This container class is used to store multiple LDAPAttribute-objects. */ class LDAPAttributeList{ - typedef AttrList::const_iterator const_iterator; - private : AttrList m_attrs; public : + typedef AttrList::const_iterator const_iterator; + /** * Copy-constructor diff --git a/contrib/ldapc++/src/LDAPBindRequest.h b/contrib/ldapc++/src/LDAPBindRequest.h index be8b98cab4..1e0ae4869f 100644 --- a/contrib/ldapc++/src/LDAPBindRequest.h +++ b/contrib/ldapc++/src/LDAPBindRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_BIND_REQUEST_H #define LDAP_BIND_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPBindRequest : LDAPRequest { private: diff --git a/contrib/ldapc++/src/LDAPCompareRequest.h b/contrib/ldapc++/src/LDAPCompareRequest.h index f30cd5384a..f283329821 100644 --- a/contrib/ldapc++/src/LDAPCompareRequest.h +++ b/contrib/ldapc++/src/LDAPCompareRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_COMPARE_REQUEST_H #define LDAP_COMPARE_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPMessageQueue; diff --git a/contrib/ldapc++/src/LDAPConnection.cpp b/contrib/ldapc++/src/LDAPConnection.cpp index 7baa9333a7..de83f32093 100644 --- a/contrib/ldapc++/src/LDAPConnection.cpp +++ b/contrib/ldapc++/src/LDAPConnection.cpp @@ -50,6 +50,7 @@ void LDAPConnection::bind(const string& dn, const string& passwd, } } delete res; + delete msg; // memcheck } void LDAPConnection::unbind(){ @@ -243,11 +244,12 @@ LDAPSearchResults* LDAPConnection::search(const string& base, int scope, LDAPSearchResults* results= 0; try{ + results = new LDAPSearchResults(); msgq = LDAPAsynConnection::search(base,scope, filter, attrs, attrsOnly, cons); - results = new LDAPSearchResults(); res = results->readMessageQueue(msgq); }catch(LDAPException e){ + delete results; // memcheck delete msgq; throw; } @@ -262,12 +264,14 @@ LDAPSearchResults* LDAPConnection::search(const string& base, int scope, case LDAPResult::REFERRAL : { LDAPUrlList urls = res->getReferralUrls(); + delete results; // memcheck delete res; delete msgq; throw LDAPReferralException(urls); } break; default : + delete results; // memcheck delete res; delete msgq; throw LDAPException(resCode); diff --git a/contrib/ldapc++/src/LDAPConnection.h b/contrib/ldapc++/src/LDAPConnection.h index 036e54cada..7016665fe3 100644 --- a/contrib/ldapc++/src/LDAPConnection.h +++ b/contrib/ldapc++/src/LDAPConnection.h @@ -6,9 +6,9 @@ #ifndef LDAP_CONNECTION_H #define LDAP_CONNECTION_H -#include "LDAPSearchResults.h" -#include "LDAPExtResult.h" -#include "LDAPAsynConnection.h" +#include +#include +#include /** Main class for synchronous LDAP-Communication * @@ -48,7 +48,7 @@ class LDAPConnection : private LDAPAsynConnection { * this connection */ LDAPConnection(const string& hostname="localhost", int port=389, - LDAPConstraints* cons=0); + LDAPConstraints* cons=new LDAPConstraints()); /** * Destructor diff --git a/contrib/ldapc++/src/LDAPConstraints.cpp b/contrib/ldapc++/src/LDAPConstraints.cpp index d98a0e38e4..194da64000 100644 --- a/contrib/ldapc++/src/LDAPConstraints.cpp +++ b/contrib/ldapc++/src/LDAPConstraints.cpp @@ -5,6 +5,8 @@ #include "debug.h" +#include "config.h" +#include "ac/time.h" #include "LDAPConstraints.h" #include "LDAPControlSet.h" diff --git a/contrib/ldapc++/src/LDAPConstraints.h b/contrib/ldapc++/src/LDAPConstraints.h index c54db4f237..0cecbc1410 100644 --- a/contrib/ldapc++/src/LDAPConstraints.h +++ b/contrib/ldapc++/src/LDAPConstraints.h @@ -7,12 +7,10 @@ #ifndef LDAP_CONSTRAINTS_H #define LDAP_CONSTRAINTS_H #include -#include "config.h" -#include "ac/time.h" -#include "LDAPControl.h" -#include "LDAPControlSet.h" -#include "LDAPRebind.h" +#include +#include +#include //TODO!! // * implement the Alias-Handling Option (OPT_DEREF) diff --git a/contrib/ldapc++/src/LDAPControlSet.h b/contrib/ldapc++/src/LDAPControlSet.h index 8ab8a12446..8538294e01 100644 --- a/contrib/ldapc++/src/LDAPControlSet.h +++ b/contrib/ldapc++/src/LDAPControlSet.h @@ -8,7 +8,7 @@ #include #include -#include "LDAPControl.h" +#include typedef list CtrlList; diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.h b/contrib/ldapc++/src/LDAPDeleteRequest.h index 3186c6825b..2c68dde66f 100644 --- a/contrib/ldapc++/src/LDAPDeleteRequest.h +++ b/contrib/ldapc++/src/LDAPDeleteRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_DELETE_REQUEST_H #define LDAP_DELETE_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPMessageQueue; class LDAPDeleteRequest : public LDAPRequest{ diff --git a/contrib/ldapc++/src/LDAPEntry.h b/contrib/ldapc++/src/LDAPEntry.h index e8341604bb..f6a89fcbbc 100644 --- a/contrib/ldapc++/src/LDAPEntry.h +++ b/contrib/ldapc++/src/LDAPEntry.h @@ -8,8 +8,8 @@ #define LDAP_ENTRY_H #include -#include "LDAPAsynConnection.h" -#include "LDAPAttributeList.h" +#include +#include /** * This class is used to store every kind of LDAP Entry. diff --git a/contrib/ldapc++/src/LDAPEntryList.h b/contrib/ldapc++/src/LDAPEntryList.h index a081b27911..4b459642b7 100644 --- a/contrib/ldapc++/src/LDAPEntryList.h +++ b/contrib/ldapc++/src/LDAPEntryList.h @@ -19,9 +19,9 @@ typedef list EntryList; * LDAPEntry-Objects */ class LDAPEntryList{ - typedef EntryList::const_iterator const_iterator; - public: + typedef EntryList::const_iterator const_iterator; + /** * Copy-Constructor */ diff --git a/contrib/ldapc++/src/LDAPExtRequest.h b/contrib/ldapc++/src/LDAPExtRequest.h index dc46b896e1..311dc11dd3 100644 --- a/contrib/ldapc++/src/LDAPExtRequest.h +++ b/contrib/ldapc++/src/LDAPExtRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_EXT_REQUEST_H #define LDAP_EXT_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPExtRequest : LDAPRequest { diff --git a/contrib/ldapc++/src/LDAPExtResult.h b/contrib/ldapc++/src/LDAPExtResult.h index 13d0cc9ab2..09634b5468 100644 --- a/contrib/ldapc++/src/LDAPExtResult.h +++ b/contrib/ldapc++/src/LDAPExtResult.h @@ -8,7 +8,7 @@ #include -#include "LDAPResult.h" +#include class LDAPRequest; diff --git a/contrib/ldapc++/src/LDAPMessage.h b/contrib/ldapc++/src/LDAPMessage.h index 130a030b94..1f57fdd90c 100644 --- a/contrib/ldapc++/src/LDAPMessage.h +++ b/contrib/ldapc++/src/LDAPMessage.h @@ -8,7 +8,7 @@ #define LDAP_MSG_H #include -#include "LDAPControlSet.h" +#include class LDAPRequest; /** diff --git a/contrib/ldapc++/src/LDAPMessageQueue.h b/contrib/ldapc++/src/LDAPMessageQueue.h index dcab47e292..6894a7e013 100644 --- a/contrib/ldapc++/src/LDAPMessageQueue.h +++ b/contrib/ldapc++/src/LDAPMessageQueue.h @@ -9,7 +9,7 @@ #include -#include "LDAPUrlList.h" +#include class LDAPAsynConnection; class LDAPMsg; diff --git a/contrib/ldapc++/src/LDAPModDNRequest.h b/contrib/ldapc++/src/LDAPModDNRequest.h index 2119eebe18..ff92ea97d6 100644 --- a/contrib/ldapc++/src/LDAPModDNRequest.h +++ b/contrib/ldapc++/src/LDAPModDNRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_MOD_DN_REQUEST_H #define LDAP_MOD_DN_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPModDNRequest : LDAPRequest { diff --git a/contrib/ldapc++/src/LDAPModList.h b/contrib/ldapc++/src/LDAPModList.h index 6fc1d74afa..e85631821c 100644 --- a/contrib/ldapc++/src/LDAPModList.h +++ b/contrib/ldapc++/src/LDAPModList.h @@ -9,7 +9,7 @@ #include #include -#include "LDAPModification.h" +#include typedef list ModList; diff --git a/contrib/ldapc++/src/LDAPModification.h b/contrib/ldapc++/src/LDAPModification.h index 5d99b1337b..553af0ba5a 100644 --- a/contrib/ldapc++/src/LDAPModification.h +++ b/contrib/ldapc++/src/LDAPModification.h @@ -8,7 +8,7 @@ #define LDAP_MODIFICATION_H #include -#include "LDAPAttribute.h" +#include class LDAPModification{ public: diff --git a/contrib/ldapc++/src/LDAPModifyRequest.h b/contrib/ldapc++/src/LDAPModifyRequest.h index c24227b49e..58df605eca 100644 --- a/contrib/ldapc++/src/LDAPModifyRequest.h +++ b/contrib/ldapc++/src/LDAPModifyRequest.h @@ -6,7 +6,7 @@ #ifndef LDAP_MODIFY_REQUEST_H #define LDAP_MODIFY_REQUEST_H -#include "LDAPRequest.h" +#include class LDAPMessageQueue; diff --git a/contrib/ldapc++/src/LDAPRebind.h b/contrib/ldapc++/src/LDAPRebind.h index 7fa553a3ea..578971e60c 100644 --- a/contrib/ldapc++/src/LDAPRebind.h +++ b/contrib/ldapc++/src/LDAPRebind.h @@ -7,7 +7,7 @@ #define LDAP_REBIND_H #include -#include "LDAPRebindAuth.h" +#include /** * Just an abstract class to provide a mechnism for rebind to another diff --git a/contrib/ldapc++/src/LDAPReferenceList.h b/contrib/ldapc++/src/LDAPReferenceList.h index 7cbe278ef4..4d26fdc54f 100644 --- a/contrib/ldapc++/src/LDAPReferenceList.h +++ b/contrib/ldapc++/src/LDAPReferenceList.h @@ -18,9 +18,9 @@ typedef list RefList; * Used internally only by LDAPSearchResults */ class LDAPReferenceList{ - typedef RefList::const_iterator const_iterator; - public: + typedef RefList::const_iterator const_iterator; + /** * Constructs an empty list. */ diff --git a/contrib/ldapc++/src/LDAPReferralException.h b/contrib/ldapc++/src/LDAPReferralException.h index 8f7a37b531..f604f67adc 100644 --- a/contrib/ldapc++/src/LDAPReferralException.h +++ b/contrib/ldapc++/src/LDAPReferralException.h @@ -8,8 +8,8 @@ #define LDAP_REFERRAL_EXCEPTION_H #include -#include "LDAPMessage.h" -#include "LDAPUrlList.h" +#include +#include class LDAPUrlList; diff --git a/contrib/ldapc++/src/LDAPRequest.h b/contrib/ldapc++/src/LDAPRequest.h index 172e98c2a5..7f3a3a2755 100644 --- a/contrib/ldapc++/src/LDAPRequest.h +++ b/contrib/ldapc++/src/LDAPRequest.h @@ -7,9 +7,9 @@ #ifndef LDAP_REQUEST_H #define LDAP_REQUEST_H -#include "LDAPConstraints.h" -#include "LDAPAsynConnection.h" -#include "LDAPMessageQueue.h" +#include +#include +#include class LDAPUrl; diff --git a/contrib/ldapc++/src/LDAPResult.h b/contrib/ldapc++/src/LDAPResult.h index 14ff558450..d53fd8496e 100644 --- a/contrib/ldapc++/src/LDAPResult.h +++ b/contrib/ldapc++/src/LDAPResult.h @@ -9,9 +9,9 @@ #include #include -#include "LDAPMessage.h" -#include "LDAPControlSet.h" -#include "LDAPUrlList.h" +#include +#include +#include class LDAPRequest; class LDAPAsynConnection; diff --git a/contrib/ldapc++/src/LDAPSearchReference.h b/contrib/ldapc++/src/LDAPSearchReference.h index 5cd94fcda9..2bdf927bb4 100644 --- a/contrib/ldapc++/src/LDAPSearchReference.h +++ b/contrib/ldapc++/src/LDAPSearchReference.h @@ -7,8 +7,8 @@ #ifndef LDAP_SEARCH_REFERENCE_H #define LDAP_SEARCH_REFERENCE_H -#include "LDAPMessage.h" -#include "LDAPUrlList.h" +#include +#include class LDAPRequest; class LDAPUrl; diff --git a/contrib/ldapc++/src/LDAPSearchRequest.cpp b/contrib/ldapc++/src/LDAPSearchRequest.cpp index 7b5b25e539..2eb3d07dcc 100644 --- a/contrib/ldapc++/src/LDAPSearchRequest.cpp +++ b/contrib/ldapc++/src/LDAPSearchRequest.cpp @@ -3,6 +3,8 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ +#include "config.h" +#include "ac/time.h" #include "debug.h" #include "LDAPSearchRequest.h" #include "LDAPException.h" diff --git a/contrib/ldapc++/src/LDAPSearchRequest.h b/contrib/ldapc++/src/LDAPSearchRequest.h index 63eb327f3b..50594e8e2b 100644 --- a/contrib/ldapc++/src/LDAPSearchRequest.h +++ b/contrib/ldapc++/src/LDAPSearchRequest.h @@ -7,7 +7,7 @@ #define LDAP_SEARCH_REQUEST_H #include -#include "LDAPRequest.h" +#include class LDAPSearchReference; class LDAPReferral; diff --git a/contrib/ldapc++/src/LDAPSearchResult.h b/contrib/ldapc++/src/LDAPSearchResult.h index 07c2c7f246..56a5d59b06 100644 --- a/contrib/ldapc++/src/LDAPSearchResult.h +++ b/contrib/ldapc++/src/LDAPSearchResult.h @@ -7,8 +7,8 @@ #ifndef LDAP_SEARCH_RESULT_H #define LDAP_SEARCH_RESULT_H -#include "LDAPMessage.h" -#include "LDAPEntry.h" +#include +#include class LDAPRequest; diff --git a/contrib/ldapc++/src/LDAPSearchResults.h b/contrib/ldapc++/src/LDAPSearchResults.h index c1d857fa21..7adc67f449 100644 --- a/contrib/ldapc++/src/LDAPSearchResults.h +++ b/contrib/ldapc++/src/LDAPSearchResults.h @@ -6,12 +6,12 @@ #ifndef LDAP_SEARCH_RESULTS_H #define LDAP_SEARCH_RESULTS_H -#include "LDAPEntry.h" -#include "LDAPEntryList.h" -#include "LDAPMessage.h" -#include "LDAPMessageQueue.h" -#include "LDAPReferenceList.h" -#include "LDAPSearchReference.h" +#include +#include +#include +#include +#include +#include class LDAPResult; diff --git a/contrib/ldapc++/src/LDAPUrl.h b/contrib/ldapc++/src/LDAPUrl.h index f72c7ab0bd..53ea2246f8 100644 --- a/contrib/ldapc++/src/LDAPUrl.h +++ b/contrib/ldapc++/src/LDAPUrl.h @@ -8,7 +8,7 @@ #define LDAP_URL_H #include -#include "StringList.h" +#include /** * This class is used to analyze and store LDAP-Urls as returned by a diff --git a/contrib/ldapc++/src/LDAPUrlList.h b/contrib/ldapc++/src/LDAPUrlList.h index 59d5d40522..848c4f6c77 100644 --- a/contrib/ldapc++/src/LDAPUrlList.h +++ b/contrib/ldapc++/src/LDAPUrlList.h @@ -7,7 +7,7 @@ #define LDAP_URL_LIST_H #include -#include "LDAPUrl.h" +#include typedef list UrlList; @@ -15,9 +15,9 @@ typedef list UrlList; * This container class is used to store multiple LDAPUrl-objects. */ class LDAPUrlList{ - typedef UrlList::const_iterator const_iterator; - public: + typedef UrlList::const_iterator const_iterator; + /** * Constructs an empty list. */ diff --git a/contrib/ldapc++/src/StringList.h b/contrib/ldapc++/src/StringList.h index 63134040ea..dc3d678213 100644 --- a/contrib/ldapc++/src/StringList.h +++ b/contrib/ldapc++/src/StringList.h @@ -14,12 +14,12 @@ typedef list ListType; * Container class to store multiple string-objects */ class StringList{ - typedef ListType::const_iterator const_iterator; - private: ListType m_data; public: + typedef ListType::const_iterator const_iterator; + /** * Constructs an empty list. */