X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fcandidates.c;h=df3e9f63a5f9c4fa9500f90fbea797536bdd9091;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=4fb312dc089efa2c1ee1e532e4398fdd213113ee;hpb=d0261ee5340213c4aedaa1ae6f5afb15c6915883;p=openldap diff --git a/servers/slapd/back-meta/candidates.c b/servers/slapd/back-meta/candidates.c index 4fb312dc08..df3e9f63a5 100644 --- a/servers/slapd/back-meta/candidates.c +++ b/servers/slapd/back-meta/candidates.c @@ -1,67 +1,23 @@ -/* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - * - * Copyright 2001, Pierangelo Masarati, 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. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * The original copyright statement follows. + * Copyright 1999-2005 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * Copyright 1999, Howard Chu, 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. * - * 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. - * + * 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" @@ -94,6 +50,11 @@ * A possible extension will include the handling of multiple suffixes */ +static int +meta_back_is_candidate_unique( + metainfo_t *mi, + struct berval *ndn ); + /* * returns 1 if suffix is candidate for dn, otherwise 0 * @@ -101,13 +62,17 @@ */ int meta_back_is_candidate( - struct berval *nsuffix, - struct berval *ndn -) + struct berval *nsuffix, + struct berval *ndn, + int scope ) { - if ( dnIsSuffix( nsuffix, ndn ) || dnIsSuffix( ndn, nsuffix ) ) { + if ( dnIsSuffix( ndn, nsuffix ) ) { + return META_CANDIDATE; + } + + if ( scope == LDAP_SCOPE_SUBTREE && dnIsSuffix( nsuffix, ndn ) ) { /* - * suffix longer than dn + * suffix longer than dn, but common part matches */ return META_CANDIDATE; } @@ -115,51 +80,24 @@ meta_back_is_candidate( return META_NOT_CANDIDATE; } -/* - * meta_back_count_candidates - * - * returns a count of the possible candidate targets - * Note: dn MUST be normalized - */ - -int -meta_back_count_candidates( - struct metainfo *li, - struct berval *ndn -) -{ - int i, cnt = 0; - - /* - * I know assertions should not check run-time values; - * at present I didn't find a place for such checks - * after config.c - */ - assert( li->targets != NULL ); - assert( li->ntargets != 0 ); - - for ( i = 0; i < li->ntargets; ++i ) { - if ( meta_back_is_candidate( &li->targets[ i ]->suffix, ndn ) ) { - ++cnt; - } - } - - return cnt; -} - /* * meta_back_is_candidate_unique * * checks whether a candidate is unique * Note: dn MUST be normalized */ -int +static int meta_back_is_candidate_unique( - struct metainfo *li, - struct berval *ndn -) + metainfo_t *mi, + struct berval *ndn ) { - return ( meta_back_count_candidates( li, ndn ) == 1 ); + switch ( meta_back_select_unique_candidate( mi, ndn ) ) { + case META_TARGET_MULTIPLE: + case META_TARGET_NONE: + return 0; + } + + return 1; } /* @@ -171,28 +109,24 @@ meta_back_is_candidate_unique( */ int meta_back_select_unique_candidate( - struct metainfo *li, - struct berval *ndn -) + metainfo_t *mi, + struct berval *ndn ) { - int i; - - switch ( meta_back_count_candidates( li, ndn ) ) { - case 1: - break; - case 0: - default: - return ( li->defaulttarget == META_DEFAULT_TARGET_NONE - ? -1 : li->defaulttarget ); - } + int i, candidate = META_TARGET_NONE; + + for ( i = 0; i < mi->mi_ntargets; ++i ) { + if ( meta_back_is_candidate( &mi->mi_targets[ i ].mt_nsuffix, ndn, LDAP_SCOPE_BASE ) ) + { + if ( candidate == META_TARGET_NONE ) { + candidate = i; - for ( i = 0; i < li->ntargets; ++i ) { - if ( meta_back_is_candidate( &li->targets[ i ]->suffix, ndn ) ) { - return i; + } else { + return META_TARGET_MULTIPLE; + } } } - return -1; + return candidate; } /* @@ -202,19 +136,18 @@ meta_back_select_unique_candidate( */ int meta_clear_unused_candidates( - struct metainfo *li, - struct metaconn *lc, - int candidate, - int reallyclean -) + Operation *op, + int candidate ) { - int i; + metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; + int i; + SlapReply *candidates = meta_back_candidates_get( op ); - for ( i = 0; i < li->ntargets; ++i ) { + for ( i = 0; i < mi->mi_ntargets; ++i ) { if ( i == candidate ) { continue; } - meta_clear_one_candidate( lc->conns[ i ], reallyclean ); + candidates[ i ].sr_tag = META_NOT_CANDIDATE; } return 0; @@ -227,25 +160,21 @@ meta_clear_unused_candidates( */ int meta_clear_one_candidate( - struct metasingleconn *lsc, - int reallyclean -) + metasingleconn_t *msc ) { - lsc->candidate = META_NOT_CANDIDATE; - - if ( !reallyclean ) { - return 0; + if ( msc->msc_ld ) { + ldap_unbind_ext_s( msc->msc_ld, NULL, NULL ); + msc->msc_ld = NULL; } - if ( lsc->ld ) { - ldap_unbind( lsc->ld ); - lsc->ld = NULL; + if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) { + ber_memfree( msc->msc_bound_ndn.bv_val ); + BER_BVZERO( &msc->msc_bound_ndn ); } - if ( lsc->bound_dn.bv_val != NULL ) { - ber_memfree( lsc->bound_dn.bv_val ); - lsc->bound_dn.bv_val = NULL; - lsc->bound_dn.bv_len = 0; + if ( !BER_BVISNULL( &msc->msc_cred ) ) { + ber_memfree( msc->msc_cred.bv_val ); + BER_BVZERO( &msc->msc_cred ); } return 0;