X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodify.c;h=4e947bfbd72cc81325129a89a2539b9ce4f1f3c7;hb=c9ec6b0cabf7c47ac9dbd9a74d4aba33934e6223;hp=e1e54052f997be4312f0dc1af7a75ecdca146c96;hpb=0e16f6acf9efe4a3dd2b413418213431ec86c33d;p=openldap

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index e1e54052f9..4e947bfbd7 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -1,7 +1,7 @@
 /* modify.c - ldap backend modify function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -50,21 +50,23 @@ ldap_back_modify(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
-    const char	*dn,
-    const char	*ndn,
+    struct berval	*dn,
+    struct berval	*ndn,
     Modifications	*modlist
 )
 {
 	struct ldapinfo	*li = (struct ldapinfo *) be->be_private;
 	struct ldapconn *lc;
-	LDAPMod **modv;
+	LDAPMod **modv = NULL;
 	LDAPMod *mods;
 	Modifications *ml;
-	int i;
-	char *mdn = NULL, *mapped;
+	int i, j, rc;
+	struct berval mapped;
+	struct berval mdn = { 0, NULL };
+	ber_int_t msgid;
 
 	lc = ldap_back_getconn(li, conn, op);
-	if ( !lc || !ldap_back_dobind( lc, op ) ) {
+	if ( !lc || !ldap_back_dobind( li, lc, conn, op ) ) {
 		return( -1 );
 	}
 
@@ -72,32 +74,32 @@ ldap_back_modify(
 	 * Rewrite the modify dn, if needed
 	 */
 #ifdef ENABLE_REWRITE
-	switch ( rewrite_session( li->rwinfo, "modifyDn", dn, conn, &mdn ) ) {
+	switch ( rewrite_session( li->rwinfo, "modifyDn", dn->bv_val, conn, &mdn.bv_val ) ) {
 	case REWRITE_REGEXEC_OK:
-		if ( mdn == NULL ) {
-			mdn = ( char * )dn;
+		if ( mdn.bv_val == NULL ) {
+			mdn.bv_val = ( char * )dn->bv_val;
 		}
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-				"[rw] modifyDn: \"%s\" -> \"%s\"\n", dn, mdn ));
+		LDAP_LOG( BACK_LDAP, DETAIL1, 
+			"[rw] modifyDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
 #else /* !NEW_LOGGING */
 		Debug( LDAP_DEBUG_ARGS, "rw> modifyDn: \"%s\" -> \"%s\"\n%s",
-				dn, mdn, "" );
+				dn->bv_val, mdn.bv_val, "" );
 #endif /* !NEW_LOGGING */
 		break;
 		
 	case REWRITE_REGEXEC_UNWILLING:
 		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-				NULL, "Unwilling to perform", NULL, NULL );
+				NULL, "Operation not allowed", NULL, NULL );
 		return( -1 );
 
 	case REWRITE_REGEXEC_ERR:
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-				NULL, "Operations error", NULL, NULL );
+		send_ldap_result( conn, op, LDAP_OTHER,
+				NULL, "Rewrite error", NULL, NULL );
 		return( -1 );
 	}
 #else /* !ENABLE_REWRITE */
-	mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
+	ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
 #endif /* !ENABLE_REWRITE */
 
 	for (i=0, ml=modlist; ml; i++,ml=ml->sml_next)
@@ -105,22 +107,29 @@ ldap_back_modify(
 
 	mods = (LDAPMod *)ch_malloc(i*sizeof(LDAPMod));
 	if (mods == NULL) {
+		rc = LDAP_NO_MEMORY;
 		goto cleanup;
 	}
 	modv = (LDAPMod **)ch_malloc((i+1)*sizeof(LDAPMod *));
 	if (modv == NULL) {
+		rc = LDAP_NO_MEMORY;
 		goto cleanup;
 	}
 
 	for (i=0, ml=modlist; ml; ml=ml->sml_next) {
-		mapped = ldap_back_map(&li->at_map, ml->sml_desc->ad_cname.bv_val, 0);
-		if (mapped == NULL) {
+		if ( ml->sml_desc->ad_type->sat_no_user_mod  ) {
+			continue;
+		}
+
+		ldap_back_map(&li->at_map, &ml->sml_desc->ad_cname, &mapped,
+				BACKLDAP_MAP);
+		if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
 			continue;
 		}
 
 		modv[i] = &mods[i];
 		mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
-		mods[i].mod_type = mapped;
+		mods[i].mod_type = mapped.bv_val;
 
 #ifdef ENABLE_REWRITE
 		/*
@@ -134,24 +143,34 @@ ldap_back_modify(
 					ml->sml_bvalues, conn );
 		}
 #endif /* ENABLE_REWRITE */
-	
-		mods[i].mod_bvalues = ml->sml_bvalues;
+
+		if ( ml->sml_bvalues != NULL ) {	
+			for (j = 0; ml->sml_bvalues[j].bv_val; j++);
+			mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
+				sizeof(struct berval *));
+			for (j = 0; ml->sml_bvalues[j].bv_val; j++)
+				mods[i].mod_bvalues[j] = &ml->sml_bvalues[j];
+			mods[i].mod_bvalues[j] = NULL;
+		} else {
+			mods[i].mod_bvalues = NULL;
+		}
+
 		i++;
 	}
 	modv[i] = 0;
 
-	ldap_modify_s( lc->ld, mdn, modv );
+	rc = ldap_modify_ext( lc->ld, mdn.bv_val, modv, op->o_ctrls, NULL, &msgid );
 
 cleanup:;
-#ifdef ENABLE_REWRITE
-	if ( mdn != dn ) {
-#endif /* ENABLE_REWRITE */
-		free( mdn );
-#ifdef ENABLE_REWRITE
+	if ( mdn.bv_val != dn->bv_val ) {
+		free( mdn.bv_val );
 	}
-#endif /* ENABLE_REWRITE */
-	free(mods);
-	free(modv);
-	return( ldap_back_op_result( lc, op ));
+	for (i=0; modv[i]; i++) {
+		ch_free(modv[i]->mod_bvalues);
+	}
+	ch_free( mods );
+	ch_free( modv );
+
+	return ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 );
 }