X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodrdn.c;h=6929c44039942f724fccb69cd9bcc2b345a5a404;hb=1a9bc6655ddf9a1d08ee4f5e6e4ef6a7707ca5f7;hp=2930ad9a7389caa37bee90e2e6108abd976abd67;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c index 2930ad9a73..6929c44039 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-2002 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-2004 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,29 +33,34 @@ int ldap_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 -) + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) be->be_private; + struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private; struct ldapconn *lc; + ber_int_t msgid; + dncookie dc; +#ifdef LDAP_BACK_PROXY_AUTHZ + LDAPControl **ctrls = NULL; + int rc = LDAP_SUCCESS; +#endif /* LDAP_BACK_PROXY_AUTHZ */ struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL }; - lc = ldap_back_getconn( li, conn, op ); - if ( !lc || !ldap_back_dobind(lc, op) ) { + lc = ldap_back_getconn( op, rs ); + if ( !lc || !ldap_back_dobind(lc, op, rs) ) { return( -1 ); } - if (newSuperior) { + dc.rwmap = &li->rwmap; +#ifdef ENABLE_REWRITE + dc.conn = op->o_conn; + dc.rs = rs; +#else + dc.tofrom = 1; + dc.normalized = 0; +#endif + if (op->orr_newSup) { int version = LDAP_VERSION3; ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version); @@ -77,85 +68,66 @@ ldap_back_modrdn( * Rewrite the new superior, if defined and required */ #ifdef ENABLE_REWRITE - switch ( rewrite_session( li->rwinfo, "newSuperiorDn", - newSuperior->bv_val, conn, &mnewSuperior.bv_val ) ) { - case REWRITE_REGEXEC_OK: - if ( mnewSuperior.bv_val == NULL ) { - mnewSuperior.bv_val = ( char * )newSuperior; - } -#ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "[rw] newSuperiorDn:" - " \"%s\" -> \"%s\"\n", - newSuperior, mnewSuperior.bv_val )); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:" - " \"%s\" -> \"%s\"\n%s", - newSuperior->bv_val, mnewSuperior.bv_val, "" ); -#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 ); + dc.ctx = "newSuperiorDn"; +#endif + if ( ldap_back_dn_massage( &dc, op->orr_newSup, + &mnewSuperior ) ) { + send_ldap_result( op, rs ); + return -1; } -#else /* !ENABLE_REWRITE */ - ldap_back_dn_massage( li, newSuperior, &mnewSuperior, 0, 1 ); - if ( mnewSuperior.bv_val == NULL ) { - return( -1 ); - } -#endif /* !ENABLE_REWRITE */ } -#ifdef ENABLE_REWRITE /* * Rewrite the modrdn dn, if required */ - switch ( rewrite_session( li->rwinfo, "modrDn", dn->bv_val, conn, &mdn.bv_val ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn.bv_val == NULL ) { - mdn.bv_val = ( char * )dn->bv_val; - } -#ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val )); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s", - dn->bv_val, mdn.bv_val, "" ); -#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 ); +#ifdef ENABLE_REWRITE + dc.ctx = "modrDn"; +#endif + if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) { + send_ldap_result( op, rs ); + return -1; + } - case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, - NULL, "Operations error", NULL, NULL ); - return( -1 ); +#ifdef LDAP_BACK_PROXY_AUTHZ + rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls ); + if ( rc != LDAP_SUCCESS ) { + goto cleanup; } -#else /* !ENABLE_REWRITE */ - ldap_back_dn_massage( li, dn, &mdn, 0, 1 ); -#endif /* !ENABLE_REWRITE */ +#endif /* LDAP_BACK_PROXY_AUTHZ */ - ldap_rename2_s( lc->ld, mdn.bv_val, newrdn->bv_val, mnewSuperior.bv_val, deleteoldrdn ); + rs->sr_err = ldap_rename( lc->ld, mdn.bv_val, + op->orr_newrdn.bv_val, mnewSuperior.bv_val, + op->orr_deleteoldrdn, +#ifdef LDAP_BACK_PROXY_AUTHZ + ctrls, +#else /* ! LDAP_BACK_PROXY_AUTHZ */ + op->o_ctrls, +#endif /* ! LDAP_BACK_PROXY_AUTHZ */ + NULL, &msgid ); + +#ifdef LDAP_BACK_PROXY_AUTHZ +cleanup: + if ( ctrls && ctrls != op->o_ctrls ) { + free( ctrls[ 0 ] ); + free( ctrls ); + } +#endif /* LDAP_BACK_PROXY_AUTHZ */ - if ( mdn.bv_val != dn->bv_val ) { + if ( mdn.bv_val != op->o_req_dn.bv_val ) { free( mdn.bv_val ); } if ( mnewSuperior.bv_val != NULL - && mnewSuperior.bv_val != newSuperior->bv_val ) { + && mnewSuperior.bv_val != op->oq_modrdn.rs_newSup->bv_val ) { free( mnewSuperior.bv_val ); } - - return( ldap_back_op_result( lc, op ) ); + +#ifdef LDAP_BACK_PROXY_AUTHZ + if ( rc != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + return -1; + } +#endif /* LDAP_BACK_PROXY_AUTHZ */ + + return( ldap_back_op_result( lc, op, rs, msgid, 1 ) ); } +