X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fcandidates.c;h=df2e87cefd5aad8ae823bbe1c23d7460fa75c19a;hb=ba6ac023ad20c1a37e2ec8d796e86ef73571a7de;hp=ee2bf0171fa611474acb771c3e59b3a8ffc71cb1;hpb=ccef53677fa741126b0c2590274c896082381123;p=openldap diff --git a/servers/slapd/back-meta/candidates.c b/servers/slapd/back-meta/candidates.c index ee2bf0171f..df2e87cefd 100644 --- a/servers/slapd/back-meta/candidates.c +++ b/servers/slapd/back-meta/candidates.c @@ -1,67 +1,23 @@ -/* - * Copyright 1998-2001 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. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * + * Copyright 1999-2004 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * 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. - * + * 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" @@ -101,43 +57,14 @@ */ int meta_back_is_candidate( - const char *nsuffix, - const char *ndn, - int ndnlen + struct berval *nsuffix, + struct berval *ndn ) { - int len = strlen( nsuffix ); - - if ( len > ndnlen ) { + if ( dnIsSuffix( nsuffix, ndn ) || dnIsSuffix( ndn, nsuffix ) ) { /* * suffix longer than dn */ - if ( ! DN_SEPARATOR( nsuffix[ ( len - ndnlen ) - 1 ] ) ) { - /* - * not a separator begins the possible common part - */ - return META_NOT_CANDIDATE; - } - - if ( strcmp( &nsuffix[ len - ndnlen ] , ndn ) == 0 ) { - /* - * Got it! - */ - return META_CANDIDATE; - } - } - - if ( len < ndnlen && ! DN_SEPARATOR( ndn[ ( ndnlen - len ) - 1 ] ) ) { - /* - * not a separator begins the possible common part - */ - return META_NOT_CANDIDATE; - } - - if ( strcmp( nsuffix, &ndn[ ndnlen - len ] ) == 0 ) { - /* - * Got it! - */ return META_CANDIDATE; } @@ -154,10 +81,10 @@ meta_back_is_candidate( int meta_back_count_candidates( struct metainfo *li, - const char *ndn + struct berval *ndn ) { - int i, cnt = 0, ndnlen = strlen( ndn ); + int i, cnt = 0; /* * I know assertions should not check run-time values; @@ -168,8 +95,7 @@ meta_back_count_candidates( assert( li->ntargets != 0 ); for ( i = 0; i < li->ntargets; ++i ) { - if ( meta_back_is_candidate( li->targets[ i ]->suffix, - ndn, ndnlen ) ) { + if ( meta_back_is_candidate( &li->targets[ i ]->suffix, ndn ) ) { ++cnt; } } @@ -186,7 +112,7 @@ meta_back_count_candidates( int meta_back_is_candidate_unique( struct metainfo *li, - const char *ndn + struct berval *ndn ) { return ( meta_back_count_candidates( li, ndn ) == 1 ); @@ -202,10 +128,10 @@ meta_back_is_candidate_unique( int meta_back_select_unique_candidate( struct metainfo *li, - const char *ndn + struct berval *ndn ) { - int i, ndnlen; + int i; switch ( meta_back_count_candidates( li, ndn ) ) { case 1: @@ -216,10 +142,8 @@ meta_back_select_unique_candidate( ? -1 : li->defaulttarget ); } - ndnlen = strlen( ndn ); for ( i = 0; i < li->ntargets; ++i ) { - if ( meta_back_is_candidate( li->targets[ i ]->suffix, - ndn, ndnlen ) ) { + if ( meta_back_is_candidate( &li->targets[ i ]->suffix, ndn ) ) { return i; } } @@ -246,7 +170,7 @@ meta_clear_unused_candidates( if ( i == candidate ) { continue; } - meta_clear_one_candidate( lc->conns[ i ], reallyclean ); + meta_clear_one_candidate( &lc->conns[ i ], reallyclean ); } return 0; @@ -274,9 +198,16 @@ meta_clear_one_candidate( lsc->ld = NULL; } - if ( lsc->bound_dn != NULL ) { - free( lsc->bound_dn ); - lsc->bound_dn = NULL; + 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 ( lsc->cred.bv_val != NULL ) { + ber_memfree( lsc->cred.bv_val ); + lsc->cred.bv_val = NULL; + lsc->cred.bv_len = 0; } return 0;