Don't reeval expression

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

diff --git a/servers/slapd/back-shell/delete.c b/servers/slapd/back-shell/delete.c
index e794a23a62486a59e81edccff8c1045d58fa69ae..da6c04a0c41109f03747fd382dfcdb782740ae4e 100644 (file)
--- a/servers/slapd/back-shell/delete.c
+++ b/servers/slapd/back-shell/delete.c
@@ -1,46 +1,73 @@
 /* delete.c - shell backend delete function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_delete(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn
+    struct berval *dn,
+    struct berval *ndn
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
+       Entry e;
        FILE                    *rfp, *wfp;
 
        if ( si->si_delete == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "delete not implemented" );
-               return;
+                   "delete not implemented", NULL, NULL );
+               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 = forkandexec( si->si_delete, &rfp, &wfp ))
-           == -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec" );
-               return;
+       if ( (op->o_private = (void *) forkandexec( si->si_delete, &rfp, &wfp ))
+           == (void *) -1 ) {
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
+                   "could not fork/exec", NULL, NULL );
+               return( -1 );
        }
 
        /* write out the request to the delete process */
        fprintf( wfp, "DELETE\n" );
-       fprintf( wfp, "msgid: %d\n", op->o_msgid );
+       fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn );
+       fprintf( wfp, "dn: %s\n", dn->bv_val );
        fclose( wfp );
 
        /* read in the results and send them along */
        read_and_send_results( be, conn, op, rfp, NULL, 0 );
        fclose( rfp );
+       return( 0 );
 }