Don't reeval expression

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

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index c11f3cb55247d56e00959c5d1633647f2dfa3e6f..6b54a499dde667524e6422df0cefe2fc8e44be3f 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,4 +1,9 @@
 /* modrdn.c - shell backend modrdn function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * LDAP v3 newSuperior support.
@@ -28,13 +33,18 @@ shell_back_modrdn(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn,
-    char       *newrdn,
+    struct berval *dn,
+    struct berval *ndn,
+    struct berval *newrdn,
+    struct berval *nnewrdn,
     int                deleteoldrdn,
-    char       *newSuperior
+    struct berval *newSuperior,
+    struct berval *nnewSuperior
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
+       Entry e;
        FILE                    *rfp, *wfp;
 
        if ( si->si_modrdn == NULL ) {
@@ -43,9 +53,26 @@ shell_back_modrdn(
                return( -1 );
        }
 
+       e.e_id = NOID;
+       e.e_name = *dn;
+       e.e_nname = *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,
+               entry, NULL, ACL_WRITE, NULL ) )
+       {
+               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+                       NULL, NULL, NULL, NULL );
+               return -1;
+       }
+
        if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }
@@ -54,11 +81,11 @@ shell_back_modrdn(
        fprintf( wfp, "MODRDN\n" );
        fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn );
-       fprintf( wfp, "newrdn: %s\n", newrdn );
+       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 );
+               fprintf( wfp, "newSuperior: %s\n", newSuperior->bv_val );
        }
        fclose( wfp );