X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodify.c;h=3c287cd8db02c67fffdebdc2b239da4e1f119849;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=c6a45a8e9856ee0e4d7c5932b7615bfedbf39d0d;hpb=cdb11fc5ebea67dfba4a403075dc9600cfb62792;p=openldap

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index c6a45a8e98..3c287cd8db 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -2,7 +2,9 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,36 +20,6 @@
  * in OpenLDAP Software and subsequently enhanced by Pierangelo
  * Masarati.
  */
-/* This is an altered version */
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
- *
- *
- *
- * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This software is being modified by Pierangelo Masarati.
- * The previously reported conditions apply to the modified code as well.
- * Changes in the original code are highlighted where required.
- * Credits for the original code go to the author, Howard Chu.
- */
 
 #include "portable.h"
 
@@ -61,168 +33,106 @@
 
 int
 ldap_back_modify(
-    Operation	*op,
-    SlapReply	*rs )
+		Operation	*op,
+		SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *) op->o_bd->be_private;
-	struct ldapconn *lc;
-	LDAPMod **modv = NULL;
-	LDAPMod *mods;
-	Modifications *ml;
-	int i, j, rc;
-	struct berval mapped;
-	struct berval mdn = { 0, NULL };
-	ber_int_t msgid;
-	dncookie dc;
-#ifdef LDAP_BACK_PROXY_AUTHZ 
-	LDAPControl **ctrls = NULL;
-#endif /* LDAP_BACK_PROXY_AUTHZ */
-
-	lc = ldap_back_getconn(op, rs);
-	if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
-		return( -1 );
-	}
-
-	/*
-	 * Rewrite the modify dn, if needed
-	 */
-	dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
-	dc.conn = op->o_conn;
-	dc.rs = rs;
-	dc.ctx = "modifyDn";
-#else
-	dc.tofrom = 1;
-	dc.normalized = 0;
-#endif
-	if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
-		send_ldap_result( op, rs );
-		return -1;
+	ldapinfo_t		*li = (ldapinfo_t *)op->o_bd->be_private;
+
+	ldapconn_t		*lc = NULL;
+	LDAPMod			**modv = NULL,
+				*mods = NULL;
+	Modifications		*ml;
+	int			i, j, rc;
+	ber_int_t		msgid;
+	int			isupdate;
+	ldap_back_send_t	retrying = LDAP_BACK_RETRYING;
+	LDAPControl		**ctrls = NULL;
+
+	if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		return rs->sr_err;
 	}
 
-	for (i=0, ml=op->oq_modify.rs_modlist; ml; i++,ml=ml->sml_next)
-		;
+	for ( i = 0, ml = op->oq_modify.rs_modlist; ml; i++, ml = ml->sml_next )
+		/* just count mods */ ;
 
-	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) {
+	modv = (LDAPMod **)ch_malloc( ( i + 1 )*sizeof( LDAPMod * )
+			+ i*sizeof( LDAPMod ) );
+	if ( modv == NULL ) {
 		rc = LDAP_NO_MEMORY;
 		goto cleanup;
 	}
+	mods = (LDAPMod *)&modv[ i + 1 ];
 
-#ifdef ENABLE_REWRITE
-	dc.ctx = "modifyAttrDN";
-#endif
-	for (i=0, ml=op->oq_modify.rs_modlist; ml; ml=ml->sml_next) {
-		int	is_oc = 0;
-
-		if ( ml->sml_desc->ad_type->sat_no_user_mod  ) {
+	isupdate = be_shadow_update( op );
+	for ( i = 0, ml = op->oq_modify.rs_modlist; ml; ml = ml->sml_next ) {
+		if ( !isupdate && !get_relax( op ) && ml->sml_desc->ad_type->sat_no_user_mod  )
+		{
 			continue;
 		}
 
-		if ( ml->sml_desc == slap_schema.si_ad_objectClass 
-				|| ml->sml_desc == slap_schema.si_ad_structuralObjectClass ) {
-			is_oc = 1;
-			mapped = ml->sml_desc->ad_cname;
+		modv[ i ] = &mods[ i ];
+		mods[ i ].mod_op = ( ml->sml_op | LDAP_MOD_BVALUES );
+		mods[ i ].mod_type = ml->sml_desc->ad_cname.bv_val;
 
-		} else {
-			ldap_back_map(&li->rwmap.rwm_at,
-					&ml->sml_desc->ad_cname,
-					&mapped, BACKLDAP_MAP);
-			if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
+		if ( ml->sml_values != NULL ) {
+			if ( ml->sml_values == NULL ) {	
 				continue;
 			}
-		}
 
-		modv[i] = &mods[i];
-		mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
-		mods[i].mod_type = mapped.bv_val;
-
-		if ( ml->sml_bvalues != NULL ) {
-			if ( is_oc ) {
-				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++) {
-					ldap_back_map(&li->rwmap.rwm_oc,
-							&ml->sml_bvalues[j],
-							&mapped, BACKLDAP_MAP);
-					if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
-						continue;
-					}
-					mods[i].mod_bvalues[j] = &mapped;
-				}
-				mods[i].mod_bvalues[j] = NULL;
-
-			} else {
-				if ( ml->sml_desc->ad_type->sat_syntax ==
-					slap_schema.si_syn_distinguishedName ) {
-					ldap_dnattr_rewrite( &dc, ml->sml_bvalues );
-				}
-
-				if ( ml->sml_bvalues == NULL ) {	
-					continue;
-				}
-
-				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;
+			for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ )
+				/* just count mods */ ;
+			mods[ i ].mod_bvalues =
+				(struct berval **)ch_malloc( ( j + 1 )*sizeof( struct berval * ) );
+			for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ )
+			{
+				mods[ i ].mod_bvalues[ j ] = &ml->sml_values[ j ];
 			}
+			mods[ i ].mod_bvalues[ j ] = NULL;
 
 		} else {
-			mods[i].mod_bvalues = NULL;
+			mods[ i ].mod_bvalues = NULL;
 		}
 
 		i++;
 	}
-	modv[i] = 0;
+	modv[ i ] = 0;
 
-#ifdef LDAP_BACK_PROXY_AUTHZ
-	rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+retry:;
+	ctrls = op->o_ctrls;
+	rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+		li->li_version, &li->li_idassert, op, rs, &ctrls );
 	if ( rc != LDAP_SUCCESS ) {
+		send_ldap_result( op, rs );
+		rc = -1;
 		goto cleanup;
 	}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-	rs->sr_err = ldap_modify_ext( lc->ld, mdn.bv_val, modv,
-#ifdef LDAP_BACK_PROXY_AUTHZ
-			ctrls,
-#else /* ! LDAP_BACK_PROXY_AUTHZ */
-			op->o_ctrls,
-#endif /* ! LDAP_BACK_PROXY_AUTHZ */
-			NULL, &msgid );
+	rs->sr_err = ldap_modify_ext( lc->lc_ld, op->o_req_dn.bv_val, modv,
+			ctrls, NULL, &msgid );
+	rc = ldap_back_op_result( lc, op, rs, msgid,
+		li->li_timeout[ SLAP_OP_MODIFY ],
+		( LDAP_BACK_SENDRESULT | retrying ) );
+	if ( rs->sr_err == LDAP_UNAVAILABLE && retrying ) {
+		retrying &= ~LDAP_BACK_RETRYING;
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+			/* if the identity changed, there might be need to re-authz */
+			(void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
+			goto retry;
+		}
+	}
 
 cleanup:;
-#ifdef LDAP_BACK_PROXY_AUTHZ
-	if ( ctrls && ctrls != op->o_ctrls ) {
-		free( ctrls[ 0 ] );
-		free( ctrls );
-	}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
+	(void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
 
-	if ( mdn.bv_val != op->o_req_dn.bv_val ) {
-		free( mdn.bv_val );
-	}
-	for (i=0; modv[i]; i++) {
-		ch_free(modv[i]->mod_bvalues);
+	for ( i = 0; modv[ i ]; i++ ) {
+		ch_free( modv[ i ]->mod_bvalues );
 	}
-	ch_free( mods );
 	ch_free( modv );
 
-#ifdef LDAP_BACK_PROXY_AUTHZ
-	if ( rc != LDAP_SUCCESS ) {
-		send_ldap_result( op, rs );
-		return -1;
+	if ( lc != NULL ) {
+		ldap_back_release_conn( li, lc );
 	}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-	return ldap_back_op_result( lc, op, rs, msgid, 1 );
+	return rc;
 }