X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fmodrdn.c;h=d4ea67f895d2c9c950488f354fbfb1666df4cd2c;hb=8d14165274b244d6f91587502bd0a23ec7b08a87;hp=79ab4ec477a0c4e589b40b752d42d0a77361b443;hpb=798289fd503bdc32ee9407b858fcf68b2e3903e9;p=openldap diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c index 79ab4ec477..d4ea67f895 100644 --- a/servers/slapd/back-meta/modrdn.c +++ b/servers/slapd/back-meta/modrdn.c @@ -1,67 +1,23 @@ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * Copyright 2001, Pierangelo Masarati, All rights reserved. + * Copyright 1999-2005 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * This work has been developed to fulfill the requirements - * of SysNet s.n.c. and it has been donated - * to the OpenLDAP Foundation in the hope that it may be useful - * to the Open Source community, but WITHOUT ANY WARRANTY. - * - * 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 and SysNet s.n.c. are 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. - * SysNet s.n.c. cannot be responsible for the consequences of the - * alterations. - * - * 4. This notice may not be removed or altered. - * - * - * This software is based on the backend back-ldap, implemented - * by Howard Chu , and modified by Mark Valence - * , Pierangelo Masarati and other - * contributors. The contribution of the original software to the present - * implementation is acknowledged in this copyright statement. - * - * A special acknowledgement goes to Howard for the overall architecture - * (and for borrowing large pieces of code), and to Mark, who implemented - * from scratch the attribute/objectclass mapping. - * - * The original copyright statement follows. - * - * 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. + * 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 + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by the Howard Chu for inclusion + * in OpenLDAP Software and subsequently enhanced by Pierangelo + * Masarati. */ #include "portable.h" @@ -77,45 +33,44 @@ int meta_back_modrdn( Operation *op, SlapReply *rs ) - /* - Backend *be, - Connection *conn, - Operation *op, - struct berval *dn, - struct berval *ndn, - struct berval *newrdn, - struct berval *nnewrdn, - int deleteoldrdn, - struct berval *newSuperior, - struct berval *nnewSuperior -) */ { struct metainfo *li = ( struct metainfo * )op->o_bd->be_private; struct metaconn *lc; int rc = 0; int candidate = -1; - char *mdn = NULL, - *mnewSuperior = NULL; + struct berval mdn = BER_BVNULL, + mnewSuperior = BER_BVNULL; + dncookie dc; - lc = meta_back_getconn( li, op, rs, META_OP_REQUIRE_SINGLE, + lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE, &op->o_req_ndn, &candidate ); if ( !lc ) { rc = -1; goto cleanup; } - if ( !meta_back_dobind( lc, op ) - || !meta_back_is_valid( lc, candidate ) ) { + assert( candidate != META_TARGET_NONE ); + + if ( !meta_back_dobind( lc, op ) ) { + rs->sr_err = LDAP_UNAVAILABLE; + + } else if ( !meta_back_is_valid( lc, candidate ) ) { rs->sr_err = LDAP_OTHER; + } + + if ( rs->sr_err != LDAP_SUCCESS ) { rc = -1; goto cleanup; } - if ( op->oq_modrdn.rs_newSup ) { + dc.conn = op->o_conn; + dc.rs = rs; + + if ( op->orr_newSup ) { int nsCandidate, version = LDAP_VERSION3; nsCandidate = meta_back_select_unique_candidate( li, - op->oq_modrdn.rs_newSup ); + op->orr_nnewSup ); if ( nsCandidate != candidate ) { /* @@ -131,46 +86,20 @@ meta_back_modrdn( Operation *op, SlapReply *rs ) * FIXME: is this the correct return code? */ rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + rs->sr_text = "cross-target rename not supported"; rc = -1; goto cleanup; } - ldap_set_option( lc->conns[ nsCandidate ].ld, + ldap_set_option( lc->mc_conns[ nsCandidate ].msc_ld, LDAP_OPT_PROTOCOL_VERSION, &version ); - + /* * Rewrite the new superior, if defined and required */ - switch ( rewrite_session( li->targets[ nsCandidate ]->rwinfo, - "newSuperiorDn", - op->oq_modrdn.rs_newSup->bv_val, - op->o_conn, - &mnewSuperior ) ) { - case REWRITE_REGEXEC_OK: - if ( mnewSuperior == NULL ) { - mnewSuperior = ( char * )op->oq_modrdn.rs_newSup; - } -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, DETAIL1, - "[rw] newSuperiorDn: \"%s\" -> \"%s\"\n", - op->oq_modrdn.rs_newSup, mnewSuperior, 0 ); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:" - " \"%s\" -> \"%s\"\n", - op->oq_modrdn.rs_newSup->bv_val, - mnewSuperior, 0 ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - rs->sr_err = LDAP_UNWILLING_TO_PERFORM; - rs->sr_text = "Operation not allowed"; - rc = -1; - goto cleanup; - - case REWRITE_REGEXEC_ERR: - rs->sr_err = LDAP_OTHER; - rs->sr_text = "Rewrite error"; + dc.rwmap = &li->targets[ nsCandidate ]->mt_rwmap; + dc.ctx = "newSuperiorDN"; + if ( ldap_back_dn_massage( &dc, op->orr_newSup, &mnewSuperior ) ) { rc = -1; goto cleanup; } @@ -179,48 +108,30 @@ meta_back_modrdn( Operation *op, SlapReply *rs ) /* * Rewrite the modrdn dn, if required */ - switch ( rewrite_session( li->targets[ candidate ]->rwinfo, - "modrDn", op->o_req_dn.bv_val, - op->o_conn, &mdn ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn == NULL ) { - mdn = ( char * )op->o_req_dn.bv_val; - } -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, DETAIL1, - "[rw] modrDn: \"%s\" -> \"%s\"\n", - op->o_req_dn.bv_val, mdn, 0 ); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n", - op->o_req_dn.bv_val, mdn, 0 ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - rs->sr_err = LDAP_UNWILLING_TO_PERFORM; - rs->sr_text = "Operation not allowed"; - rc = -1; - goto cleanup; - - case REWRITE_REGEXEC_ERR: - rs->sr_err = LDAP_OTHER; - rs->sr_text = "Rewrite error"; + dc.rwmap = &li->targets[ candidate ]->mt_rwmap; + dc.ctx = "modrDN"; + if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) { rc = -1; goto cleanup; } - ldap_rename2_s( lc->conns[ candidate ].ld, mdn, - op->oq_modrdn.rs_newrdn.bv_val, - mnewSuperior, op->oq_modrdn.rs_deleteoldrdn ); + rc = ldap_rename_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val, + op->orr_newrdn.bv_val, + mnewSuperior.bv_val, + op->orr_deleteoldrdn, + NULL, NULL ) != LDAP_SUCCESS; cleanup:; - if ( mdn != op->o_req_dn.bv_val ) { - free( mdn ); + if ( mdn.bv_val != op->o_req_dn.bv_val ) { + free( mdn.bv_val ); + BER_BVZERO( &mdn ); } - if ( mnewSuperior != NULL - && mnewSuperior != op->oq_modrdn.rs_newSup->bv_val ) { - free( mnewSuperior ); + if ( !BER_BVISNULL( &mnewSuperior ) + && mnewSuperior.bv_val != op->orr_newSup->bv_val ) + { + free( mnewSuperior.bv_val ); + BER_BVZERO( &mnewSuperior ); } if ( rc == 0 ) { @@ -229,7 +140,7 @@ cleanup:; } /* else */ send_ldap_result( op, rs ); - return rc; + return rc; }