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 91d7149eca03354dda942276c916ae4df77407e8..69ad41d740ab6d5f9939ecd017e081d77e11e9b6 100644 (file)
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -30,7 +30,7 @@ shell_back_modify(
        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", NULL, NULL );
                return( -1 );
@@ -38,14 +38,13 @@ shell_back_modify(
 
        if ( (op->o_private = (void *) forkandexec( si->si_modify, &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 );
        }
 
        /* write out the request to the modify process */
        fprintf( wfp, "MODIFY\n" );
-       fprintf( wfp, "opid: %ld/%ld\n", op->o_connid, (long) op->o_msgid );
        fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
        fprintf( wfp, "dn: %s\n", dn->bv_val );