ITS#4310 seems to affect also back-ldbm

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

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index 7828aca0392aa931024889bc6ac951e613792a29..1d660a3920b272c17262e99f7e5bfb38b2524846 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,21 +1,31 @@
 /* modrdn.c - shell backend modrdn function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-/*
- * LDAP v3 newSuperior support.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999, Juan C. Gomez, All rights reserved.
- * This software is not subject to any license of Silicon Graphics 
- * Inc. or Purdue University.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * without restriction or fee of any kind as long as this notice
- * is preserved.
+ * 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
  *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
  */
 
 #include "portable.h"
@@ -30,48 +40,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 );
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
-           == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", NULL, 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,
+                       op->oq_modrdn.rs_newSup ? ACL_WDEL : ACL_WRITE,
+                       NULL ) )
+       {
+               send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+               return -1;
+       }
+
+       if ( forkandexec( si->si_modrdn, &rfp, &wfp ) == (pid_t)-1 ) {
+               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 );
 }