X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodrdn.c;h=6929c44039942f724fccb69cd9bcc2b345a5a404;hb=1a9bc6655ddf9a1d08ee4f5e6e4ef6a7707ca5f7;hp=167c22cb75754f354ca39f0f6c82f07760e015b0;hpb=f8c1bc5ccb7f4c02acf88983eb5c8dac95400a00;p=openldap

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 167c22cb75..6929c44039 100644
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -1,25 +1,24 @@
 /* modrdn.c - ldap backend modrdn function */
 /* $OpenLDAP$ */
-
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -34,34 +33,101 @@
 
 int
 ldap_back_modrdn(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    const char	*dn,
-    const char	*ndn,
-    const char	*newrdn,
-    int		deleteoldrdn,
-    const char	*newSuperior
-)
+    SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *) be->be_private;
+	struct ldapinfo	*li = (struct ldapinfo *) op->o_bd->be_private;
 	struct ldapconn *lc;
+	ber_int_t msgid;
+	dncookie dc;
+#ifdef LDAP_BACK_PROXY_AUTHZ 
+	LDAPControl **ctrls = NULL;
+	int rc = LDAP_SUCCESS;
+#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-	lc = ldap_back_getconn( li, conn, op );
-	if (!lc)
+	struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
+
+	lc = ldap_back_getconn( op, rs );
+	if ( !lc || !ldap_back_dobind(lc, op, rs) ) {
 		return( -1 );
+	}
 
-	if (newSuperior) {
+	dc.rwmap = &li->rwmap;
+#ifdef ENABLE_REWRITE
+	dc.conn = op->o_conn;
+	dc.rs = rs;
+#else
+	dc.tofrom = 1;
+	dc.normalized = 0;
+#endif
+	if (op->orr_newSup) {
 		int version = LDAP_VERSION3;
 		ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+		
+		/*
+		 * Rewrite the new superior, if defined and required
+	 	 */
+#ifdef ENABLE_REWRITE
+		dc.ctx = "newSuperiorDn";
+#endif
+		if ( ldap_back_dn_massage( &dc, op->orr_newSup,
+			&mnewSuperior ) ) {
+			send_ldap_result( op, rs );
+			return -1;
+		}
 	}
 
-	if (!lc->bound) {
-		ldap_back_dobind(lc, op);
-		if (!lc->bound)
-			return( -1 );
+	/*
+	 * Rewrite the modrdn dn, if required
+	 */
+#ifdef ENABLE_REWRITE
+	dc.ctx = "modrDn";
+#endif
+	if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+		send_ldap_result( op, rs );
+		return -1;
 	}
 
-	ldap_rename2_s( lc->ld, dn, newrdn, newSuperior, deleteoldrdn );
-	return( ldap_back_op_result( lc, op ) );
+#ifdef LDAP_BACK_PROXY_AUTHZ
+	rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+	if ( rc != LDAP_SUCCESS ) {
+		goto cleanup;
+	}
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+	rs->sr_err = ldap_rename( lc->ld, mdn.bv_val,
+			op->orr_newrdn.bv_val, mnewSuperior.bv_val,
+			op->orr_deleteoldrdn,
+#ifdef LDAP_BACK_PROXY_AUTHZ
+			ctrls,
+#else /* ! LDAP_BACK_PROXY_AUTHZ */
+			op->o_ctrls,
+#endif /* ! LDAP_BACK_PROXY_AUTHZ */
+			NULL, &msgid );
+
+#ifdef LDAP_BACK_PROXY_AUTHZ
+cleanup:
+	if ( ctrls && ctrls != op->o_ctrls ) {
+		free( ctrls[ 0 ] );
+		free( ctrls );
+	}
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+	if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+		free( mdn.bv_val );
+	}
+	if ( mnewSuperior.bv_val != NULL
+		&& mnewSuperior.bv_val != op->oq_modrdn.rs_newSup->bv_val ) {
+		free( mnewSuperior.bv_val );
+	}
+
+#ifdef LDAP_BACK_PROXY_AUTHZ
+	if ( rc != LDAP_SUCCESS ) {
+		send_ldap_result( op, rs );
+		return -1;
+	}
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+	return( ldap_back_op_result( lc, op, rs, msgid, 1 ) );
 }
+