X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodrdn.c;h=13cd7fd8d81e4faa13c48fcfb72540b78768e7b8;hb=9ed5ca4f7a3e807fe3d105c34738095b0e891f5d;hp=74c2922ce82605a4020c0b2b563358270f5a4cee;hpb=74fa239a201cd2d785fe34bdbaf6804161bdb231;p=openldap diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c index 74c2922ce8..a4c99fcc53 100644 --- a/servers/slapd/back-ldap/modrdn.c +++ b/servers/slapd/back-ldap/modrdn.c @@ -1,38 +1,24 @@ /* modrdn.c - ldap backend modrdn 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-2012 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,102 +33,92 @@ int ldap_back_modrdn( - Backend *be, - Connection *conn, - Operation *op, - const char *dn, - const char *ndn, - const char *newrdn, - int deleteoldrdn, - const char *newSuperior -) + Operation *op, + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) be->be_private; - struct ldapconn *lc; + ldapinfo_t *li = (ldapinfo_t *)op->o_bd->be_private; - char *mdn = NULL, *mnewSuperior = NULL; + ldapconn_t *lc = NULL; + ber_int_t msgid; + LDAPControl **ctrls = NULL; + ldap_back_send_t retrying = LDAP_BACK_RETRYING; + int rc = LDAP_SUCCESS; + char *newSup = NULL; + struct berval newrdn = BER_BVNULL; - lc = ldap_back_getconn( li, conn, op ); - if ( !lc || !ldap_back_dobind(lc, op) ) { - return( -1 ); + if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) { + return rs->sr_err; } - if (newSuperior) { - int version = LDAP_VERSION3; - ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version); - - /* - * Rewrite the new superior, if defined and required - */ -#ifdef ENABLE_REWRITE - switch ( rewrite_session( li->rwinfo, "newSuperiorDn", - newSuperior, conn, &mnewSuperior ) ) { - case REWRITE_REGEXEC_OK: - if ( mnewSuperior == NULL ) { - mnewSuperior = ( char * )newSuperior; - } - Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:" - " \"%s\" -> \"%s\"\n%s", - newSuperior, mnewSuperior, "" ); + if ( op->orr_newSup ) { + /* needs LDAPv3 */ + switch ( li->li_version ) { + case LDAP_VERSION3: break; - case REWRITE_REGEXEC_UNWILLING: - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, "Unwilling to perform", - NULL, NULL ); + case 0: + if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) { + break; + } + /* fall thru */ - case REWRITE_REGEXEC_ERR: - return( -1 ); + default: + /* op->o_protocol cannot be anything but LDAPv3, + * otherwise wouldn't be here */ + rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + send_ldap_result( op, rs ); + goto cleanup; } -#else /* !ENABLE_REWRITE */ - mnewSuperior = ldap_back_dn_massage( li, - ch_strdup( newSuperior ), 0 ); - if ( mnewSuperior == NULL ) { - return( -1 ); - } -#endif /* !ENABLE_REWRITE */ + + newSup = op->orr_newSup->bv_val; } -#ifdef ENABLE_REWRITE - /* - * Rewrite the modrdn dn, if required - */ - switch ( rewrite_session( li->rwinfo, "modrDn", dn, conn, &mdn ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn == NULL ) { - mdn = ( char * )dn; - } - Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s", - dn, mdn, "" ); - break; - - case REWRITE_REGEXEC_UNWILLING: - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, "Unwilling to perform", NULL, NULL ); + /* NOTE: we need to copy the newRDN in case it was formed + * from a DN by simply changing the length (ITS#5397) */ + newrdn = op->orr_newrdn; + if ( newrdn.bv_val[ newrdn.bv_len ] != '\0' ) { + ber_dupbv_x( &newrdn, &op->orr_newrdn, op->o_tmpmemctx ); + } + +retry: + ctrls = op->o_ctrls; + rc = ldap_back_controls_add( op, rs, lc, &ctrls ); + if ( rc != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + rc = -1; + goto cleanup; + } - case REWRITE_REGEXEC_ERR: - return( -1 ); + rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_dn.bv_val, + newrdn.bv_val, newSup, + op->orr_deleteoldrdn, ctrls, NULL, &msgid ); + rc = ldap_back_op_result( lc, op, rs, msgid, + li->li_timeout[ SLAP_OP_MODRDN ], + ( 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_controls_free( op, rs, &ctrls ); + goto retry; + } } -#else /* !ENABLE_REWRITE */ - mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 ); -#endif /* !ENABLE_REWRITE */ - ldap_rename2_s( lc->ld, mdn, newrdn, mnewSuperior, deleteoldrdn ); + ldap_pvt_thread_mutex_lock( &li->li_counter_mutex ); + ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_MODRDN ], 1 ); + ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex ); -#ifdef ENABLE_REWRITE - if ( mdn != dn ) { -#endif /* ENABLE_REWRITE */ - free( mdn ); -#ifdef ENABLE_REWRITE +cleanup: + (void)ldap_back_controls_free( op, rs, &ctrls ); + + if ( newrdn.bv_val != op->orr_newrdn.bv_val ) { + op->o_tmpfree( newrdn.bv_val, op->o_tmpmemctx ); } -#endif /* ENABLE_REWRITE */ - if ( mnewSuperior != NULL -#ifdef ENABLE_REWRITE - && mnewSuperior != newSuperior -#endif /* ENABLE_REWRITE */ - ) { - free( mnewSuperior ); + + if ( lc != NULL ) { + ldap_back_release_conn( li, lc ); } - - return( ldap_back_op_result( lc, op ) ); + + return rc; } +