#include <ac/string.h>.

[openldap] / servers / slapd / back-shell / modrdn.c

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index 6b54a499dde667524e6422df0cefe2fc8e44be3f..f24831e3ac79e3bba7cc6ebe8d19e6b7a343ccf1 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,7 +1,7 @@
 /* modrdn.c - shell backend modrdn function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -30,67 +30,57 @@
 
 int
 shell_back_modrdn(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    struct berval *dn,
-    struct berval *ndn,
-    struct berval *newrdn,
-    struct berval *nnewrdn,
-    int                deleteoldrdn,
-    struct berval *newSuperior,
-    struct berval *nnewSuperior
-)
+    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,
-                   "modrdn not implemented", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                   "modrdn not implemented" );
                return( -1 );
        }
 
        e.e_id = NOID;
-       e.e_name = *dn;
-       e.e_nname = *ndn;
+       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( be, conn, op, &e,
+       if ( ! access_allowed( op, &e,
                entry, NULL, ACL_WRITE, NULL ) )
        {
-               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                       NULL, NULL, NULL, 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_result( conn, op, LDAP_OTHER, NULL,
-                   "could not fork/exec", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_OTHER,
+                   "could not fork/exec" );
                return( -1 );
        }
 
        /* write out the request to the modrdn process */
        fprintf( wfp, "MODRDN\n" );
        fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
-       print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn->bv_val );
-       fprintf( wfp, "newrdn: %s\n", newrdn->bv_val );
-       fprintf( wfp, "deleteoldrdn: %d\n", deleteoldrdn ? 1 : 0 );
-       if (newSuperior != NULL) {
-               fprintf( wfp, "newSuperior: %s\n", newSuperior->bv_val );
+       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 );
 }