summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2007-12-20 15:17:47 +0000
committerArthur de Jong <arthur@arthurdejong.org>2007-12-20 15:17:47 +0000
commite78d7cb30f1518838595f21b6ec5176822139bbb (patch)
treebc1235005fb1bbbf365d69b0b649fb1be0fd552a
parenta087ef33fef4ae5815a8d670a6f74ae44e014dba (diff)
remove unused tests and compatibility code
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@502 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--compat/ldap.h13
-rw-r--r--configure.ac24
2 files changed, 2 insertions, 35 deletions
diff --git a/compat/ldap.h b/compat/ldap.h
index f0125c4..678c5de 100644
--- a/compat/ldap.h
+++ b/compat/ldap.h
@@ -28,18 +28,5 @@
#ifndef LDAP_MSG_ONE
#define LDAP_MSG_ONE 0x00
#endif
-#ifndef LDAP_MSG_ALL
-#define LDAP_MSG_ALL 0x01
-#endif
-#ifndef LDAP_MSG_RECEIVED
-#define LDAP_MSG_RECEIVED 0x02
-#endif
-
-#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)
-extern int ldap_ld_free(LDAP * ld, int close, LDAPControl **,
- LDAPControl **);
-#else
-extern int ldap_ld_free(LDAP * ld, int close);
-#endif /* OPENLDAP 2.x */
#endif /* not _COMPAT_LDAP_H */
diff --git a/configure.ac b/configure.ac
index b9f3f55..528d130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,28 +122,13 @@ AC_CHECK_HEADERS(lber.h)
AC_CHECK_HEADERS(ldap.h,,AC_MSG_ERROR([could not locate <ldap.h>]))
AC_CHECK_HEADERS(ldap_ssl.h)
AC_CHECK_HEADERS(nss.h)
-AC_CHECK_HEADERS(nsswitch.h)
-AC_CHECK_HEADERS(irs.h)
-AC_CHECK_HEADERS(thread.h)
AC_CHECK_HEADERS(pthread.h)
-AC_CHECK_HEADERS(synch.h)
-AC_CHECK_HEADERS(malloc.h)
AC_CHECK_HEADERS(shadow.h)
-AC_CHECK_HEADERS(prot.h)
-AC_CHECK_HEADERS(port_before.h)
-AC_CHECK_HEADERS(port_after.h)
AC_CHECK_HEADERS(aliases.h)
-AC_CHECK_HEADERS(net/route.h)
-AC_CHECK_HEADERS(netinet/if_ether.h)
AC_CHECK_HEADERS(netinet/ether.h)
AC_CHECK_HEADERS(ctype.h)
AC_CHECK_HEADERS(getopt.h)
-AC_CHECK_HEADERS(alignof.h)
-AC_CHECK_HEADERS(rpc/rpcent.h)
-AC_CHECK_HEADERS(sys/byteorder.h)
AC_CHECK_HEADERS(sys/un.h)
-AC_CHECK_HEADERS(libc-lock.h)
-AC_CHECK_HEADERS(bits/libc-lock.h)
AC_CHECK_HEADERS(sasl.h sasl/sasl.h)
AC_CHECK_HEADERS(strings.h)
AC_CHECK_HEADERS(gssldap.h)
@@ -175,14 +160,9 @@ LIBS="$save_LIBS"
# tests
# checks for availability of functions
-AC_CHECK_FUNCS(strtok_r)
AC_CHECK_FUNCS(sigaction)
-AC_CHECK_FUNCS(sigset)
-AC_CHECK_FUNCS(res_search)
-AC_CHECK_FUNCS(dn_expand)
AC_CHECK_FUNCS(snprintf)
AC_CHECK_FUNCS(gethostbyname)
-AC_CHECK_FUNCS(nsdispatch)
AC_CHECK_FUNCS(ether_aton)
AC_CHECK_FUNCS(ether_ntoa)
AC_CHECK_FUNCS(setgroups)
@@ -288,8 +268,8 @@ AC_CHECK_LIB(gssldap, ldap_gss_bind,[LIBS="-lgssldap $LIBS"],,$LIBS)
AC_CHECK_FUNCS(sasl_auxprop_request)
AC_CHECK_FUNCS(gss_krb5_ccache_name)
-AC_CHECK_FUNCS(ldap_init ldap_get_lderrno ldap_parse_result ldap_memfree ldap_controls_free)
-AC_CHECK_FUNCS(ldap_ld_free ldap_explode_rdn ldap_set_option ldap_get_option)
+AC_CHECK_FUNCS(ldap_parse_result ldap_memfree ldap_controls_free)
+AC_CHECK_FUNCS(ldap_explode_rdn ldap_set_option ldap_get_option)
AC_CHECK_FUNCS(ldap_sasl_interactive_bind_s ldap_initialize ldap_search_ext)
AC_CHECK_FUNCS(ldap_create_control ldap_create_page_control ldap_parse_page_control)
AC_CHECK_FUNCS(ldap_domain2hostlist ldap_domain2dn)