r20487: Remove the unused dn2ad_canonical() call

(This used to be commit 86e6ae6a9fe2a6fdaeeb503653a312662c7f50e9)

diff --git a/source3/configure.in b/source3/configure.in
index 3b2e6386c0437a87607a2a8d6731a9ce7aa6a6c0..0d169b18d4a901e3d8340f041e6c04ae703013b0 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3201,7 +3201,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/source3/libads/ldap.c b/source3/libads/ldap.c
index f65ae02ede3881296c29b72eefda1c85df81ec9f..c263e8e133bcef34c9b99eeb438eaea5224c5a97 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -978,21 +978,6 @@ void ads_memfree(ADS_STRUCT *ads, void *mem)
        return unix_dn;
 }
 
-/**
- * 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
@@ -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