X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodify.c;h=3c287cd8db02c67fffdebdc2b239da4e1f119849;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=e1e54052f997be4312f0dc1af7a75ecdca146c96;hpb=0e16f6acf9efe4a3dd2b413418213431ec86c33d;p=openldap diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c index e1e54052f9..3c287cd8db 100644 --- a/servers/slapd/back-ldap/modify.c +++ b/servers/slapd/back-ldap/modify.c @@ -1,38 +1,24 @@ /* modify.c - ldap backend modify function */ /* $OpenLDAP$ */ -/* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* This is an altered version */ -/* - * Copyright 1999, Howard Chu, All rights reserved. - * - * 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. +/* This work is part of OpenLDAP Software . * + * 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 + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * Copyright 2000, Pierangelo Masarati, All rights reserved. - * - * 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. + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by the Howard Chu for inclusion + * in OpenLDAP Software and subsequently enhanced by Pierangelo + * Masarati. */ #include "portable.h" @@ -47,111 +33,106 @@ int ldap_back_modify( - Backend *be, - Connection *conn, - Operation *op, - const char *dn, - const char *ndn, - Modifications *modlist -) + Operation *op, + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) be->be_private; - struct ldapconn *lc; - LDAPMod **modv; - LDAPMod *mods; - Modifications *ml; - int i; - char *mdn = NULL, *mapped; - - lc = ldap_back_getconn(li, conn, op); - if ( !lc || !ldap_back_dobind( lc, op ) ) { - return( -1 ); - } - - /* - * Rewrite the modify dn, if needed - */ -#ifdef ENABLE_REWRITE - switch ( rewrite_session( li->rwinfo, "modifyDn", dn, conn, &mdn ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn == NULL ) { - mdn = ( char * )dn; - } -#ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "[rw] modifyDn: \"%s\" -> \"%s\"\n", dn, mdn )); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> modifyDn: \"%s\" -> \"%s\"\n%s", - dn, mdn, "" ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, "Unwilling to perform", NULL, NULL ); - return( -1 ); - - case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, - NULL, "Operations error", NULL, NULL ); - 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; } -#else /* !ENABLE_REWRITE */ - mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 ); -#endif /* !ENABLE_REWRITE */ - for (i=0, ml=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) { - 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 ]; - 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) { + 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; } - modv[i] = &mods[i]; - mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES; - mods[i].mod_type = mapped; - -#ifdef ENABLE_REWRITE - /* - * FIXME: dn-valued attrs should be rewritten - * to allow their use in ACLs at the back-ldap - * level. - */ - if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid, - SLAPD_DN_SYNTAX ) == 0 ) { - ldap_dnattr_rewrite( li->rwinfo, - ml->sml_bvalues, conn ); + 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; + + if ( ml->sml_values != NULL ) { + if ( ml->sml_values == NULL ) { + continue; + } + + 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; } -#endif /* ENABLE_REWRITE */ - - mods[i].mod_bvalues = ml->sml_bvalues; + i++; } - modv[i] = 0; + modv[ i ] = 0; + +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; + } - ldap_modify_s( lc->ld, mdn, modv ); + 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 ENABLE_REWRITE - if ( mdn != dn ) { -#endif /* ENABLE_REWRITE */ - free( mdn ); -#ifdef ENABLE_REWRITE + (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls ); + + for ( i = 0; modv[ i ]; i++ ) { + ch_free( modv[ i ]->mod_bvalues ); + } + ch_free( modv ); + + if ( lc != NULL ) { + ldap_back_release_conn( li, lc ); } -#endif /* ENABLE_REWRITE */ - free(mods); - free(modv); - return( ldap_back_op_result( lc, op )); + + return rc; }