Cleanup up LDAP_CLIENT_UPDATE code... including some bug fixing.

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

diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c
index ce2c7bfd07129070e4d90af4596841259744b33f..69ad41d740ab6d5f9939ecd017e081d77e11e9b6 100644 (file)
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -1,4 +1,9 @@
 /* modify.c - shell backend modify function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -10,61 +15,71 @@
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_modify(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn,
-    LDAPMod    *mods
+    struct berval *dn,
+    struct berval *ndn,
+    Modifications      *ml
 )
 {
+       Modification *mod;
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
        FILE                    *rfp, *wfp;
        int                     i;
 
-       if ( si->si_modify == NULL ) {
+       if ( IS_NULLCMD( si->si_modify ) ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "modify not implemented" );
-               return;
+                   "modify not implemented", NULL, NULL );
+               return( -1 );
        }
 
-       if ( (op->o_private = forkandexec( si->si_modify, &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_modify, &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 modify process */
        fprintf( wfp, "MODIFY\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 );
-       for ( ; mods != NULL; mods = mods->mod_next ) {
-               switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+       fprintf( wfp, "dn: %s\n", dn->bv_val );
+       for ( ; ml != NULL; ml = ml->sml_next ) {
+               mod = &ml->sml_mod;
+
+               /* FIXME: should use LDIF routines to deal with binary data */
+
+               switch ( mod->sm_op ) {
                case LDAP_MOD_ADD:
-                       fprintf( wfp, "add: %s", mods->mod_type );
+                       fprintf( wfp, "add: %s\n", mod->sm_desc->ad_cname.bv_val );
                        break;
 
                case LDAP_MOD_DELETE:
-                       fprintf( wfp, "delete: %s", mods->mod_type );
+                       fprintf( wfp, "delete: %s\n", mod->sm_desc->ad_cname.bv_val );
                        break;
 
                case LDAP_MOD_REPLACE:
-                       fprintf( wfp, "replace: %s", mods->mod_type );
+                       fprintf( wfp, "replace: %s\n", mod->sm_desc->ad_cname.bv_val );
                        break;
                }
 
-               for ( i = 0; mods->mod_bvalues != NULL && mods->mod_bvalues[i]
-                   != NULL; i++ ) {
-                       fprintf( wfp, "%s: %s\n", mods->mod_type,
-                           mods->mod_bvalues[i]->bv_val );
+               if( mod->sm_bvalues != NULL ) {
+                       for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+                               fprintf( wfp, "%s: %s\n", mod->sm_desc->ad_cname.bv_val,
+                                       mod->sm_bvalues[i].bv_val /* binary! */ );
+                       }
                }
+
+               fprintf( wfp, "-\n" );
        }
        fclose( wfp );
 
        /* read in the results and send them along */
        read_and_send_results( be, conn, op, rfp, NULL, 0 );
        fclose( rfp );
+       return( 0 );
 }