/* 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"
Backend *be,
Connection *conn,
Operation *op,
- char *dn,
- LDAPModList *ml
+ 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", NULL, NULL );
return( -1 );
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, "msgid: %ld\n", op->o_msgid );
+ fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
print_suffixes( wfp, be );
- fprintf( wfp, "dn: %s\n", dn );
- for ( ; ml != NULL; ml = ml->ml_next ) {
- switch ( ml->ml_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\n", ml->ml_type );
+ fprintf( wfp, "add: %s\n", mod->sm_desc->ad_cname.bv_val );
break;
case LDAP_MOD_DELETE:
- fprintf( wfp, "delete: %s\n", ml->ml_type );
+ fprintf( wfp, "delete: %s\n", mod->sm_desc->ad_cname.bv_val );
break;
case LDAP_MOD_REPLACE:
- fprintf( wfp, "replace: %s\n", ml->ml_type );
+ fprintf( wfp, "replace: %s\n", mod->sm_desc->ad_cname.bv_val );
break;
}
- for ( i = 0; ml->ml_bvalues != NULL && ml->ml_bvalues[i]
- != NULL; i++ ) {
- fprintf( wfp, "%s: %s\n", ml->ml_type,
- ml->ml_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_and_send_results( be, conn, op, rfp, NULL, 0 );
fclose( rfp );
return( 0 );
-
}