X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fmodrdn.c;h=f1907323996106cdfd3ac352639f9373102f9048;hb=ba6ac023ad20c1a37e2ec8d796e86ef73571a7de;hp=c0f6d1437ff666c9359658cda0cd406afb8d9125;hpb=1abb8cb3397c543201a421c5a229304b9d3aded3;p=openldap diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c index c0f6d1437f..f190732399 100644 --- a/servers/slapd/back-meta/modrdn.c +++ b/servers/slapd/back-meta/modrdn.c @@ -1,67 +1,23 @@ -/* - * Copyright 1998-2002 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-2004 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" @@ -76,38 +32,38 @@ #include "back-meta.h" int -meta_back_modrdn( - 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 -) +meta_back_modrdn( Operation *op, SlapReply *rs ) { - struct metainfo *li = ( struct metainfo * )be->be_private; - struct metaconn *lc; - int candidate = -1; - - char *mdn = NULL, *mnewSuperior = NULL; - - lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE, - ndn, &candidate ); - if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) { - send_ldap_result( conn, op, LDAP_OTHER, - NULL, NULL, NULL, NULL ); - return -1; + struct metainfo *li = ( struct metainfo * )op->o_bd->be_private; + struct metaconn *lc; + int rc = 0; + int candidate = -1; + struct berval mdn = BER_BVNULL, + mnewSuperior = BER_BVNULL; + dncookie dc; + + lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE, + &op->o_req_ndn, &candidate ); + if ( !lc ) { + rc = -1; + goto cleanup; } - if ( newSuperior ) { + if ( !meta_back_dobind( lc, op ) + || !meta_back_is_valid( lc, candidate ) ) { + rs->sr_err = LDAP_OTHER; + rc = -1; + goto cleanup; + } + + dc.conn = op->o_conn; + dc.rs = rs; + + if ( op->oq_modrdn.rs_newSup ) { int nsCandidate, version = LDAP_VERSION3; nsCandidate = meta_back_select_unique_candidate( li, - newSuperior ); + op->oq_modrdn.rs_nnewSup ); if ( nsCandidate != candidate ) { /* @@ -122,88 +78,57 @@ meta_back_modrdn( /* * FIXME: is this the correct return code? */ - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, NULL, NULL, NULL ); - return -1; + rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + rc = -1; + goto cleanup; } ldap_set_option( lc->conns[ nsCandidate ].ld, LDAP_OPT_PROTOCOL_VERSION, &version ); - + /* * Rewrite the new superior, if defined and required */ - switch ( rewrite_session( li->targets[ nsCandidate ]->rwinfo, - "newSuperiorDn", - newSuperior->bv_val, - conn, - &mnewSuperior ) ) { - case REWRITE_REGEXEC_OK: - if ( mnewSuperior == NULL ) { - mnewSuperior = ( char * )newSuperior; - } -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, DETAIL1, - "[rw] newSuperiorDn: \"%s\" -> \"%s\"\n", - newSuperior, mnewSuperior, 0 ); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:" - " \"%s\" -> \"%s\"\n%s", - newSuperior->bv_val, mnewSuperior, "" ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, NULL, NULL, NULL ); - return -1; - - case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OTHER, - NULL, NULL, NULL, NULL ); - return -1; + dc.rwmap = &li->targets[ nsCandidate ]->rwmap; + dc.ctx = "newSuperiorDN"; + if ( ldap_back_dn_massage( &dc, op->oq_modrdn.rs_newSup, &mnewSuperior ) ) { + rc = -1; + goto cleanup; } } /* * Rewrite the modrdn dn, if required */ - switch ( rewrite_session( li->targets[ candidate ]->rwinfo, - "modrDn", dn->bv_val, conn, &mdn ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn == NULL ) { - mdn = ( char * )dn->bv_val; - } -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, DETAIL1, - "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn, 0 ); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s", - dn->bv_val, mdn, "" ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, NULL, NULL, NULL ); - return -1; - - case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OTHER, - NULL, NULL, NULL, NULL ); - return -1; + dc.rwmap = &li->targets[ candidate ]->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, newrdn->bv_val, - mnewSuperior, deleteoldrdn ); + ldap_rename2_s( lc->conns[ candidate ].ld, mdn.bv_val, + op->oq_modrdn.rs_newrdn.bv_val, + mnewSuperior.bv_val, + op->oq_modrdn.rs_deleteoldrdn ); - if ( mdn != dn->bv_val ) { - free( mdn ); - } - if ( mnewSuperior != NULL && mnewSuperior != newSuperior->bv_val ) { - free( mnewSuperior ); +cleanup:; + if ( mdn.bv_val != op->o_req_dn.bv_val ) { + free( mdn.bv_val ); } - return meta_back_op_result( lc, op ); + if ( mnewSuperior.bv_val != NULL + && mnewSuperior.bv_val != op->oq_modrdn.rs_newSup->bv_val ) { + free( mnewSuperior.bv_val ); + } + + if ( rc == 0 ) { + return meta_back_op_result( lc, op, rs ) == LDAP_SUCCESS + ? 0 : 1; + } /* else */ + + send_ldap_result( op, rs ); + return rc; + }