X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fmodrdn.c;h=f24831e3ac79e3bba7cc6ebe8d19e6b7a343ccf1;hb=6387a3b6bfd835e3bf3075f0030a57739b82d995;hp=f3f00217ad95bfe5a553f5d988f3dfb498d6ebb3;hpb=c0f5c884297aac7b930afad98f601912c83e9e72;p=openldap

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index f3f00217ad..f24831e3ac 100644
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,4 +1,22 @@
 /* modrdn.c - shell backend modrdn function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+/*
+ * LDAP v3 newSuperior support.
+ *
+ * Copyright 1999, Juan C. Gomez, All rights reserved.
+ * This software is not subject to any license of Silicon Graphics 
+ * Inc. or Purdue University.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * without restriction or fee of any kind as long as this notice
+ * is preserved.
+ *
+ */
 
 #include "portable.h"
 
@@ -10,42 +28,59 @@
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_modrdn(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    char	*dn,
-    char	*newrdn,
-    int		deleteoldrdn
-)
+    SlapReply	*rs )
 {
-	struct shellinfo	*si = (struct shellinfo *) be->be_private;
+	struct shellinfo	*si = (struct shellinfo *) op->o_bd->be_private;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	Entry e;
 	FILE			*rfp, *wfp;
 
 	if ( si->si_modrdn == NULL ) {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
 		    "modrdn not implemented" );
-		return;
+		return( -1 );
 	}
 
-	if ( (op->o_private = forkandexec( si->si_modrdn, &rfp, &wfp ))
-	    == -1 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+	e.e_id = NOID;
+	e.e_name = op->o_req_dn;
+	e.e_nname = op->o_req_ndn;
+	e.e_attrs = NULL;
+	e.e_ocflags = 0;
+	e.e_bv.bv_len = 0;
+	e.e_bv.bv_val = NULL;
+	e.e_private = NULL;
+
+	if ( ! access_allowed( op, &e,
+		entry, NULL, ACL_WRITE, NULL ) )
+	{
+		send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+		return -1;
+	}
+
+	if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
+	    == (void *) -1 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
 		    "could not fork/exec" );
-		return;
+		return( -1 );
 	}
 
 	/* write out the request to the modrdn process */
 	fprintf( wfp, "MODRDN\n" );
-	fprintf( wfp, "msgid: %d\n", op->o_msgid );
-	print_suffixes( wfp, be );
-	fprintf( wfp, "dn: %s\n", dn );
-	fprintf( wfp, "newrdn: %s\n", newrdn );
-	fprintf( wfp, "deleteoldrdn: %d\n", deleteoldrdn ? 1 : 0 );
+	fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
+	print_suffixes( wfp, op->o_bd );
+	fprintf( wfp, "dn: %s\n", op->o_req_dn.bv_val );
+	fprintf( wfp, "newrdn: %s\n", op->oq_modrdn.rs_newrdn.bv_val );
+	fprintf( wfp, "deleteoldrdn: %d\n", op->oq_modrdn.rs_deleteoldrdn ? 1 : 0 );
+	if (op->oq_modrdn.rs_newSup != NULL) {
+		fprintf( wfp, "newSuperior: %s\n", op->oq_modrdn.rs_newSup->bv_val );
+	}
 	fclose( wfp );
 
 	/* read in the results and send them along */
-	read_and_send_results( be, conn, op, rfp, NULL, 0 );
+	read_and_send_results( op, rs, rfp );
 	fclose( rfp );
+	return( 0 );
 }