From: Michael Adam <obnox@samba.org>
Date: Tue, 15 May 2007 10:47:40 +0000 (+0000)
Subject: r22893: Use ldap_rename_s instead of deprecated ldap_rename2_s.
X-Git-Tag: samba-4.0.0alpha6~801^2~5881
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2753d30cbea6cc6689cda17182caff20d65c6f6c;p=thirdparty%2Fsamba.git

r22893: Use ldap_rename_s instead of deprecated ldap_rename2_s.
This fixes the build on solaris (host sun9).
And hopefully doesn't break any other builds... :-)
If it does, we need some configure magic.

Thanks to Björn Jacke <bj@sernet.de>.
(This used to be commit a43775ab36aa3d36108e1b5860bbee6c47e9b1b4)
---

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index f5f273d3f2f..5b87017d848 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1754,7 +1754,8 @@ ADS_STATUS ads_move_machine_acct(ADS_STRUCT *ads, const char *machine_name,
 		goto done;
 	}
 
-	ldap_status = ldap_rename2_s(ads->ld, computer_dn, computer_rdn, org_unit, 1);
+	ldap_status = ldap_rename_s(ads->ld, computer_dn, computer_rdn, 
+				    org_unit, 1, NULL, NULL);
 	rc = ADS_ERROR(ldap_status);
 
 done: