From 259b90aaa2d642475f793604606c8d249abc2138 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 5 Oct 2000 14:16:16 +0000 Subject: [PATCH] - changed configure option --disable-debug to --enable-debug - rebuilt the configure script --- contrib/ldapc++/Makefile.in | 55 +++++++++++---- contrib/ldapc++/README | 2 + contrib/ldapc++/acconfig.h | 2 + contrib/ldapc++/configure | 63 ++++++++--------- contrib/ldapc++/configure.in | 4 +- contrib/ldapc++/src/LDAPAttribute.cpp | 1 - contrib/ldapc++/src/LDAPBindRequest.cpp | 3 +- contrib/ldapc++/src/LDAPMessageQueue.cpp | 2 - contrib/ldapc++/src/LDAPSearchRequest.cpp | 1 - contrib/ldapc++/src/Makefile.am | 64 ++++++++--------- contrib/ldapc++/src/Makefile.in | 2 +- contrib/ldapc++/src/StringList.cpp | 1 - contrib/ldapc++/src/ac/string.h | 84 ----------------------- contrib/ldapc++/src/config.h.in | 2 + contrib/ldapc++/src/debug.h | 10 +-- 15 files changed, 122 insertions(+), 174 deletions(-) create mode 100644 contrib/ldapc++/acconfig.h delete mode 100644 contrib/ldapc++/src/ac/string.h diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in index 92a5e7412e..e2c7795a30 100644 --- a/contrib/ldapc++/Makefile.in +++ b/contrib/ldapc++/Makefile.in @@ -80,9 +80,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO aclocal.m4 \ -config.guess config.sub configure configure.in install-sh ltconfig \ -ltmain.sh missing mkinstalldirs +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 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -106,6 +107,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +src/config.h: src/stamp-h + @if test ! -f $@; then \ + rm -f src/stamp-h; \ + $(MAKE) src/stamp-h; \ + else :; fi +src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ + $(SHELL) ./config.status + @echo timestamp > src/stamp-h 2> /dev/null +$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/src/stamp-h.in; \ + $(MAKE) $(srcdir)/src/stamp-h.in; \ + else :; fi +$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f src/config.h + +maintainer-clean-hdr: + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -294,33 +323,33 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ diff --git a/contrib/ldapc++/README b/contrib/ldapc++/README index b761678d88..5c49b1fff2 100644 --- a/contrib/ldapc++/README +++ b/contrib/ldapc++/README @@ -14,6 +14,8 @@ libraries in the default place: C-libraries are located. --with-ldap-includes= : To tell configure where the OpenLDAP include files are located. +--enable-debug to enable compliation with debugging symbols and stderr + output (run "configure --help" to see all possible command line options) If configure finishes without problems. You can simply call "make" to diff --git a/contrib/ldapc++/acconfig.h b/contrib/ldapc++/acconfig.h new file mode 100644 index 0000000000..01f4957f51 --- /dev/null +++ b/contrib/ldapc++/acconfig.h @@ -0,0 +1,2 @@ +#undef WITH_DEBUG + diff --git a/contrib/ldapc++/configure b/contrib/ldapc++/configure index e5ebeec781..7a697fcb87 100755 --- a/contrib/ldapc++/configure +++ b/contrib/ldapc++/configure @@ -22,7 +22,7 @@ ac_help="$ac_help ac_help="$ac_help --disable-libtool-lock avoid locking (might break parallel builds)" ac_help="$ac_help ---disable-debug" +--enable-debug" ac_help="$ac_help --with-libldap=DIR Path to the libldap library [/usr/local/lib]" ac_help="$ac_help @@ -1621,10 +1621,11 @@ exec 5>>./config.log if test "${enable_debug+set}" = set; then enableval="$enable_debug" - -else - CXXFLAGS="-g -O0 -Wall" + cat >> confdefs.h <<\EOF +#define WITH_DEBUG 1 +EOF + fi @@ -1658,7 +1659,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:1662: checking for main in -lresolv" >&5 +echo "configure:1663: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1666,14 +1667,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1701,7 +1702,7 @@ else fi echo $ac_n "checking for ber_strdup in -llber""... $ac_c" 1>&6 -echo "configure:1705: checking for ber_strdup in -llber" >&5 +echo "configure:1706: checking for ber_strdup in -llber" >&5 ac_lib_var=`echo lber'_'ber_strdup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1709,7 +1710,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llber $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1748,7 +1749,7 @@ else fi echo $ac_n "checking for ldap_add_ext in -lldap""... $ac_c" 1>&6 -echo "configure:1752: checking for ldap_add_ext in -lldap" >&5 +echo "configure:1753: checking for ldap_add_ext in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_add_ext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1758,7 +1759,7 @@ LIBS="-lldap -llber $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1797,12 +1798,12 @@ else fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1801: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1802: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1811,7 +1812,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1832,7 +1833,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1836: checking how to run the C preprocessor" >&5 +echo "configure:1837: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1847,13 +1848,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1864,13 +1865,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1881,13 +1882,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1913,17 +1914,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:1917: checking for ldap.h" >&5 +echo "configure:1918: checking for ldap.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1945,7 +1946,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -1967,17 +1968,17 @@ rm -f conftest* ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:1971: checking for lber.h" >&5 +echo "configure:1972: checking for lber.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1999,7 +2000,7 @@ else fi cat > conftest.$ac_ext < EOF diff --git a/contrib/ldapc++/configure.in b/contrib/ldapc++/configure.in index f93c7cdcd1..f7d8e3f5e9 100644 --- a/contrib/ldapc++/configure.in +++ b/contrib/ldapc++/configure.in @@ -21,9 +21,9 @@ AC_PROG_RANLIB dnl AM_DISABLE_SHARED AM_PROG_LIBTOOL dnl AC_PROG_MAKE_SET -AC_ARG_ENABLE(debug,--disable-debug,[ - ],[ +AC_ARG_ENABLE(debug,--enable-debug,[ CXXFLAGS="-g -O0 -Wall" + AC_DEFINE(WITH_DEBUG) ] ) diff --git a/contrib/ldapc++/src/LDAPAttribute.cpp b/contrib/ldapc++/src/LDAPAttribute.cpp index d27d52c715..a3200dd4b5 100644 --- a/contrib/ldapc++/src/LDAPAttribute.cpp +++ b/contrib/ldapc++/src/LDAPAttribute.cpp @@ -165,7 +165,6 @@ LDAPMod* LDAPAttribute::toLDAPMod() const { ret->mod_op=LDAP_MOD_BVALUES; //always assume binary-Values ret->mod_type= new char[m_name.size()+1]; m_name.copy(ret->mod_type,string::npos); - cerr << " " << m_name<< endl; ret->mod_type[m_name.size()]=0; ret->mod_bvalues=this->getBerValues(); return ret; diff --git a/contrib/ldapc++/src/LDAPBindRequest.cpp b/contrib/ldapc++/src/LDAPBindRequest.cpp index 06819ff63e..af1e01d50c 100644 --- a/contrib/ldapc++/src/LDAPBindRequest.cpp +++ b/contrib/ldapc++/src/LDAPBindRequest.cpp @@ -71,7 +71,8 @@ LDAPMessageQueue* LDAPBindRequest::sendRequest(){ LDAPRequest* LDAPBindRequest::followReferral(LDAPMsg* urls){ DEBUG(LDAP_DEBUG_TRACE,"LDAPBindRequest::followReferral()" << endl); - cerr << "ReferralChasing for bind-operation not implemented yet" << endl; + DEBUG(LDAP_DEBUG_TRACE, + "ReferralChasing for bind-operation not implemented yet" << endl); return 0; } diff --git a/contrib/ldapc++/src/LDAPMessageQueue.cpp b/contrib/ldapc++/src/LDAPMessageQueue.cpp index dd3b12eeb9..6d0e614d6f 100644 --- a/contrib/ldapc++/src/LDAPMessageQueue.cpp +++ b/contrib/ldapc++/src/LDAPMessageQueue.cpp @@ -156,8 +156,6 @@ LDAPRequest* LDAPMessageQueue::chaseReferral(LDAPMsg* ref){ LDAPRequest *refReq=req->followReferral(ref); if(refReq !=0){ if(refReq->getConstraints()->getHopLimit() < refReq->getHopCount()){ - cout << "LIMIT:" << refReq->getConstraints()->getHopLimit() - << " COUNT:" << refReq->getHopCount() << endl; delete(refReq); throw LDAPException(LDAP_REFERRAL_LIMIT_EXCEEDED); } diff --git a/contrib/ldapc++/src/LDAPSearchRequest.cpp b/contrib/ldapc++/src/LDAPSearchRequest.cpp index 6115c71024..7b5b25e539 100644 --- a/contrib/ldapc++/src/LDAPSearchRequest.cpp +++ b/contrib/ldapc++/src/LDAPSearchRequest.cpp @@ -95,7 +95,6 @@ LDAPRequest* LDAPSearchRequest::followReferral(LDAPMsg* ref){ } con = getConnection()->referralConnect(urls,usedUrl,m_cons); if(con != 0){ - cerr << usedUrl->getFilter(); if((usedUrl->getFilter() != "") && (usedUrl->getFilter() != m_filter)){ filter=usedUrl->getFilter(); diff --git a/contrib/ldapc++/src/Makefile.am b/contrib/ldapc++/src/Makefile.am index b1a6bfaeff..8a1cf211dc 100644 --- a/contrib/ldapc++/src/Makefile.am +++ b/contrib/ldapc++/src/Makefile.am @@ -6,40 +6,40 @@ lib_LTLIBRARIES = libldapcpp.la libldapcpp_la_SOURCES = LDAPAddRequest.cpp \ - LDAPAsynConnection.cpp \ - LDAPAttribute.cpp \ - LDAPAttributeList.cpp \ - LDAPBindRequest.cpp \ - LDAPCompareRequest.cpp \ + LDAPAsynConnection.cpp \ + LDAPAttribute.cpp \ + LDAPAttributeList.cpp \ + LDAPBindRequest.cpp \ + LDAPCompareRequest.cpp \ LDAPConnection.cpp \ - LDAPConstraints.cpp \ - LDAPControl.cpp \ - LDAPControlSet.cpp \ - LDAPDeleteRequest.cpp \ - LDAPEntry.cpp \ - LDAPEntryList.cpp \ - LDAPException.cpp \ - LDAPExtRequest.cpp \ - LDAPExtResult.cpp \ - LDAPMessage.cpp \ - LDAPMessageQueue.cpp \ - LDAPModDNRequest.cpp \ - LDAPModification.cpp \ - LDAPModifyRequest.cpp \ - LDAPModList.cpp \ - LDAPRebind.cpp \ - LDAPRebindAuth.cpp \ - LDAPReferralException.cpp \ + LDAPConstraints.cpp \ + LDAPControl.cpp \ + LDAPControlSet.cpp \ + LDAPDeleteRequest.cpp \ + LDAPEntry.cpp \ + LDAPEntryList.cpp \ + LDAPException.cpp \ + LDAPExtRequest.cpp \ + LDAPExtResult.cpp \ + LDAPMessage.cpp \ + LDAPMessageQueue.cpp \ + LDAPModDNRequest.cpp \ + LDAPModification.cpp \ + LDAPModifyRequest.cpp \ + LDAPModList.cpp \ + LDAPRebind.cpp \ + LDAPRebindAuth.cpp \ + LDAPReferralException.cpp \ LDAPReferenceList.cpp \ LDAPRequest.cpp \ - LDAPResult.cpp \ - LDAPSearchReference.cpp \ - LDAPSearchRequest.cpp \ - LDAPSearchResult.cpp \ - LDAPSearchResults.cpp \ - LDAPUrl.cpp \ - LDAPUrlList.cpp \ - StringList.cpp + LDAPResult.cpp \ + LDAPSearchReference.cpp \ + LDAPSearchRequest.cpp \ + LDAPSearchResult.cpp \ + LDAPSearchResults.cpp \ + LDAPUrl.cpp \ + LDAPUrlList.cpp \ + StringList.cpp include_HEADERS = LDAPAsynConnection.h \ LDAPAttribute.h \ @@ -78,7 +78,7 @@ noinst_HEADERS = LDAPAddRequest.h \ libldapcpp_la_LIBADD = -lldap -llber libldapcpp_la_LDFLAGS = -version-info 0:1:0 - + noinst_PROGRAMS = main main_SOURCES = main.cpp diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in index aeca82c268..c7dbada49d 100644 --- a/contrib/ldapc++/src/Makefile.in +++ b/contrib/ldapc++/src/Makefile.in @@ -76,7 +76,7 @@ VERSION = @VERSION@ lib_LTLIBRARIES = libldapcpp.la -libldapcpp_la_SOURCES = LDAPAddRequest.cpp LDAPAsynConnection.cpp LDAPAttribute.cpp LDAPAttributeList.cpp LDAPBindRequest.cpp LDAPCompareRequest.cpp LDAPConnection.cpp LDAPConstraints.cpp LDAPControl.cpp LDAPControlSet.cpp LDAPDeleteRequest.cpp LDAPEntry.cpp LDAPEntryList.cpp LDAPException.cpp LDAPExtRequest.cpp LDAPExtResult.cpp LDAPMessage.cpp LDAPMessageQueue.cpp LDAPModDNRequest.cpp LDAPModification.cpp LDAPModifyRequest.cpp LDAPModList.cpp LDAPRebind.cpp LDAPRebindAuth.cpp LDAPReferralException.cpp LDAPReferenceList.cpp LDAPRequest.cpp LDAPResult.cpp LDAPSearchReference.cpp LDAPSearchRequest.cpp LDAPSearchResult.cpp LDAPSearchResults.cpp LDAPUrl.cpp LDAPUrlList.cpp StringList.cpp +libldapcpp_la_SOURCES = LDAPAddRequest.cpp LDAPAsynConnection.cpp LDAPAttribute.cpp LDAPAttributeList.cpp LDAPBindRequest.cpp LDAPCompareRequest.cpp LDAPConnection.cpp LDAPConstraints.cpp LDAPControl.cpp LDAPControlSet.cpp LDAPDeleteRequest.cpp LDAPEntry.cpp LDAPEntryList.cpp LDAPException.cpp LDAPExtRequest.cpp LDAPExtResult.cpp LDAPMessage.cpp LDAPMessageQueue.cpp LDAPModDNRequest.cpp LDAPModification.cpp LDAPModifyRequest.cpp LDAPModList.cpp LDAPRebind.cpp LDAPRebindAuth.cpp LDAPReferralException.cpp LDAPReferenceList.cpp LDAPRequest.cpp LDAPResult.cpp LDAPSearchReference.cpp LDAPSearchRequest.cpp LDAPSearchResult.cpp LDAPSearchResults.cpp LDAPUrl.cpp LDAPUrlList.cpp StringList.cpp include_HEADERS = LDAPAsynConnection.h LDAPAttribute.h LDAPAttributeList.h LDAPConnection.h LDAPConstraints.h LDAPControl.h LDAPEntry.h LDAPEntryList.h LDAPException.h LDAPExtResult.h LDAPMessage.h LDAPMessageQueue.h LDAPModification.h LDAPModList.h LDAPRebind.h LDAPRebindAuth.h LDAPReferralException.h LDAPReferenceList.h LDAPResult.h LDAPSearchReference.h LDAPSearchResult.h LDAPUrl.h LDAPUrlList.h StringList.h diff --git a/contrib/ldapc++/src/StringList.cpp b/contrib/ldapc++/src/StringList.cpp index f77563fbb4..4189c39200 100644 --- a/contrib/ldapc++/src/StringList.cpp +++ b/contrib/ldapc++/src/StringList.cpp @@ -19,7 +19,6 @@ StringList::StringList(char** values){ }else{ char** i; for(i=values; *i != 0; i++){ - cerr << *i << endl; m_data.push_back(string(*i)); } } diff --git a/contrib/ldapc++/src/ac/string.h b/contrib/ldapc++/src/ac/string.h deleted file mode 100644 index c5471e1583..0000000000 --- a/contrib/ldapc++/src/ac/string.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Generic string.h */ -/* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted only - * as authorized by the OpenLDAP Public License. A copy of this - * license is available at http://www.OpenLDAP.org/license.html or - * in file LICENSE in the top-level directory of the distribution. - */ - -#ifndef _AC_STRING_H -#define _AC_STRING_H - -#ifdef STDC_HEADERS -# include - -#else -# ifdef HAVE_STRING_H -# include -# elif HAVE_STRINGS_H -# include -# endif - -# ifdef HAVE_MEMORY_H -# include -# endif - -# ifndef HAVE_STRRCHR -# undef strchr -# define strchr index -# undef strrchr -# define strrchr rindex -# endif - -# ifndef HAVE_MEMCPY -# undef memcpy -# define memcpy(d, s, n) ((void) bcopy ((s), (d), (n))) -# undef memmove -# define memmove(d, s, n) ((void) bcopy ((s), (d), (n))) -# endif -#endif - -/* use ldap_pvt_strtok instead of strtok or strtok_r! */ -LDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, const char *delim, - char **pos )); - -#ifndef HAVE_STRDUP - /* strdup() is missing, declare our own version */ -# undef strdup -# define strdup(s) ber_strdup(s) -#else - /* some systems fail to declare strdup */ - LDAP_LIBC_F(char *) (strdup)(); -#endif - -/* - * some systems fail to declare strcasecmp() and strncasecmp() - * we need them declared so we can obtain pointers to them - */ - -/* In Mingw32, strcasecmp is not in the C library, so we don't LIBC_F it */ -int (strcasecmp)(); -int (strncasecmp)(); - -#ifndef SAFEMEMCPY -# if defined( HAVE_MEMMOVE ) -# define SAFEMEMCPY( d, s, n ) memmove((d), (s), (n)) -# elif defined( HAVE_BCOPY ) -# define SAFEMEMCPY( d, s, n ) bcopy((s), (d), (n)) -# else - /* nothing left but memcpy() */ -# define SAFEMEMCPY( d, s, n ) memcpy((d), (s), (n)) -# endif -#endif - -#define AC_MEMCPY( d, s, n ) (SAFEMEMCPY((d),(s),(n))) -#define AC_FMEMCPY( d, s, n ) do { \ - if((n) == 1) *((char*)(d)) = *((char*)(s)); \ - else AC_MEMCPY( (d), (s), (n) ); \ - } while(0) - -#endif /* _AC_STRING_H */ diff --git a/contrib/ldapc++/src/config.h.in b/contrib/ldapc++/src/config.h.in index 3fe0c7d706..48d69d91fd 100644 --- a/contrib/ldapc++/src/config.h.in +++ b/contrib/ldapc++/src/config.h.in @@ -3,6 +3,8 @@ /* Define if you can safely include both and . */ #undef TIME_WITH_SYS_TIME +#undef WITH_DEBUG + /* Define if you have the resolv library (-lresolv). */ #undef HAVE_LIBRESOLV diff --git a/contrib/ldapc++/src/debug.h b/contrib/ldapc++/src/debug.h index 13cf128b3b..8a5b14e317 100644 --- a/contrib/ldapc++/src/debug.h +++ b/contrib/ldapc++/src/debug.h @@ -19,14 +19,14 @@ #define PRINT_FILE \ cerr << "file: " __FILE__ << " line: " << __LINE__ +#ifdef WITH_DEBUG #define DEBUG(level, arg) \ if((level) & DEBUGLEVEL){ \ cerr << arg ; \ } - -/* -* #undef DEBUG -* #define DEBUG(level,arg) -*/ +#else +#undef DEBUG +#define DEBUG(level,arg) +#endif //WITH_DEBUG #endif // DEBUG_H -- 2.39.5