X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fmodify.c;h=f74aabef194cee91749864eb5c8bd92019322750;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=7da9c212512a3ae36782bdb13bd6ff3911b41948;hpb=60802201e3a39b0a46bfa7156c608026f7d361ba;p=openldap

diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c
index 7da9c21251..f74aabef19 100644
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -1,8 +1,31 @@
 /* modify.c - shell backend modify function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
  */
 
 #include "portable.h"
@@ -17,61 +40,82 @@
 
 int
 shell_back_modify(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    const char	*dn,
-    const char	*ndn,
-    LDAPModList	*ml
-)
+    SlapReply	*rs )
 {
-	struct shellinfo	*si = (struct shellinfo *) be->be_private;
+	Modification *mod;
+	struct shellinfo	*si = (struct shellinfo *) op->o_bd->be_private;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	Modifications *ml  = op->oq_modify.rs_modlist;
+	Entry e;
 	FILE			*rfp, *wfp;
 	int			i;
 
 	if ( si->si_modify == NULL ) {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "modify not implemented", NULL, NULL );
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+		    "modify not implemented" );
 		return( -1 );
 	}
 
-	if ( (op->o_private = (void *) forkandexec( si->si_modify, &rfp, &wfp ))
-	    == (void *) -1 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-		    "could not fork/exec", NULL, NULL );
+	e.e_id = NOID;
+	e.e_name = op->o_req_dn;
+	e.e_nname = op->o_req_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( op, &e,
+		entry, NULL, ACL_WRITE, NULL ) )
+	{
+		send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+		return -1;
+	}
+
+	if ( forkandexec( si->si_modify, &rfp, &wfp ) == (pid_t)-1 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
+		    "could not fork/exec" );
 		return( -1 );
 	}
 
 	/* write out the request to the modify process */
 	fprintf( wfp, "MODIFY\n" );
 	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 ) {
+	print_suffixes( wfp, op->o_bd );
+	fprintf( wfp, "dn: %s\n", op->o_req_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_values != NULL ) {
+			for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
+				fprintf( wfp, "%s: %s\n", mod->sm_desc->ad_cname.bv_val,
+					mod->sm_values[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 );
+	read_and_send_results( op, rs, rfp );
 	fclose( rfp );
 	return( 0 );
 }