Don't reeval expression

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

diff --git a/servers/slapd/back-shell/add.c b/servers/slapd/back-shell/add.c
index 61752d3278b9174b697901c0a912aac5ec523c59..02a52093808e83789b2eb697dece18e4d67125e7 100644 (file)
--- a/servers/slapd/back-shell/add.c
+++ b/servers/slapd/back-shell/add.c
@@ -1,4 +1,9 @@
 /* add.c - shell backend add function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -19,27 +24,36 @@ shell_back_add(
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
        FILE                    *rfp, *wfp;
        int                     len;
 
        if ( si->si_add == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "add not implemented" );
+                   "add not implemented", NULL, NULL );
                return( -1 );
        }
 
+       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_add, &rfp, &wfp )) == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec" );
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
+                   "could not fork/exec", NULL, NULL );
                return( -1 );
        }
 
        /* write out the request to the add process */
        fprintf( wfp, "ADD\n" );
-       fprintf( wfp, "msgid: %ld\n", op->o_msgid );
+       fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
        ldap_pvt_thread_mutex_lock( &entry2str_mutex );
-       fprintf( wfp, "%s", entry2str( e, &len, 0 ) );
+       fprintf( wfp, "%s", entry2str( e, &len ) );
        ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
        fclose( wfp );