From 09938acc1464f0819617b4c3ddcd3a5f4bd9d9ff Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 2 Jan 2007 21:45:12 +0000 Subject: [PATCH] r20487: Remove the unused dn2ad_canonical() call --- source/configure.in | 1 - source/libads/ldap.c | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/source/configure.in b/source/configure.in index 489b1ff0ada..8870ec47862 100644 --- a/source/configure.in +++ b/source/configure.in @@ -3193,7 +3193,6 @@ if test x"$with_ldap_support" != x"no"; then AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc]) - AC_CHECK_FUNC_EXT(ldap_dn2ad_canonical,$LDAP_LIBS) AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS) if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes"; then diff --git a/source/libads/ldap.c b/source/libads/ldap.c index f65ae02ede3..c263e8e133b 100644 --- a/source/libads/ldap.c +++ b/source/libads/ldap.c @@ -979,21 +979,6 @@ void ads_memfree(ADS_STRUCT *ads, void *mem) } /** - * Get a canonical dn from search results - * @param ads connection to ads server - * @param msg Search result - * @return dn string - **/ - char *ads_get_dn_canonical(ADS_STRUCT *ads, LDAPMessage *msg) -{ -#ifdef HAVE_LDAP_DN2AD_CANONICAL - return ldap_dn2ad_canonical(ads_get_dn(ads, msg)); -#else - return NULL; -#endif -} - -/** * Get the parent from a dn * @param dn the dn to return the parent from * @return parent dn string @@ -2938,8 +2923,6 @@ ADS_STATUS ads_join_realm(ADS_STRUCT *ads, const char *machine_name, } #endif -#ifdef HAVE_LDAP - /** * Delete a machine from the realm * @param ads connection to ads server @@ -3059,6 +3042,5 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname) SAFE_FREE(host); return status; } -#endif #endif -- 2.11.4.GIT