svn commit: samba r20487 - in branches: SAMBA_3_0/source SAMBA_3_0/source/libads SAMBA_3_0_24/source SAMBA_3_0_24/source/libads

[jerry at samba.org]

Author: jerry
Date: 2007-01-02 21:45:12 +0000 (Tue, 02 Jan 2007)
New Revision: 20487

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20487

Log:
Remove the unused dn2ad_canonical() call


Modified:
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/libads/ldap.c
   branches/SAMBA_3_0_24/source/configure.in
   branches/SAMBA_3_0_24/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-01-02 21:29:09 UTC (rev 20486)
+++ branches/SAMBA_3_0/source/configure.in	2007-01-02 21:45:12 UTC (rev 20487)
@@ -3201,7 +3201,6 @@
   
   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

Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2007-01-02 21:29:09 UTC (rev 20486)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2007-01-02 21:45:12 UTC (rev 20487)
@@ -979,21 +979,6 @@
 }
 
 /**
- * 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 @@
 }
 #endif
 
-#ifdef HAVE_LDAP
-
 /**
  * Delete a machine from the realm
  * @param ads connection to ads server
@@ -3059,6 +3042,5 @@
 	SAFE_FREE(host);
 	return status;
 }
-#endif
 
 #endif

Modified: branches/SAMBA_3_0_24/source/configure.in
===================================================================
--- branches/SAMBA_3_0_24/source/configure.in	2007-01-02 21:29:09 UTC (rev 20486)
+++ branches/SAMBA_3_0_24/source/configure.in	2007-01-02 21:45:12 UTC (rev 20487)
@@ -3193,7 +3193,6 @@
   
   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

Modified: branches/SAMBA_3_0_24/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0_24/source/libads/ldap.c	2007-01-02 21:29:09 UTC (rev 20486)
+++ branches/SAMBA_3_0_24/source/libads/ldap.c	2007-01-02 21:45:12 UTC (rev 20487)
@@ -979,21 +979,6 @@
 }
 
 /**
- * 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 @@
 }
 #endif
 
-#ifdef HAVE_LDAP
-
 /**
  * Delete a machine from the realm
  * @param ads connection to ads server
@@ -3059,6 +3042,5 @@
 	SAFE_FREE(host);
 	return status;
 }
-#endif
 
 #endif