X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fdncache.c;h=c1020c73409aeff4c88886e7a3120476ac345474;hb=8d14165274b244d6f91587502bd0a23ec7b08a87;hp=febb96341491c3cd2c7bc643a5276c68a6299413;hpb=74fa239a201cd2d785fe34bdbaf6804161bdb231;p=openldap diff --git a/servers/slapd/back-meta/dncache.c b/servers/slapd/back-meta/dncache.c index febb963414..c1020c7340 100644 --- a/servers/slapd/back-meta/dncache.c +++ b/servers/slapd/back-meta/dncache.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. - * - * - * 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. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * 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: + * Copyright 1999-2005 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * 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,10 +33,10 @@ */ struct metadncacheentry { - char *dn; - int target; + struct berval dn; + int target; - time_t lastupdated; + time_t lastupdated; }; /* @@ -98,11 +54,11 @@ meta_dncache_cmp( { struct metadncacheentry *cc1 = ( struct metadncacheentry * )c1; struct metadncacheentry *cc2 = ( struct metadncacheentry * )c2; - + /* * case sensitive, because the dn MUST be normalized */ - return strcmp( cc1->dn, cc2->dn ); + return ber_bvcmp( &cc1->dn, &cc2->dn); } /* @@ -123,7 +79,7 @@ meta_dncache_dup( /* * case sensitive, because the dn MUST be normalized */ - return ( strcmp( cc1->dn, cc2->dn ) == 0 ) ? -1 : 0; + return ( ber_bvcmp( &cc1->dn, &cc2->dn ) == 0 ) ? -1 : 0; } /* @@ -135,14 +91,17 @@ meta_dncache_dup( int meta_dncache_get_target( struct metadncache *cache, - const char *ndn + struct berval *ndn ) { struct metadncacheentry tmp_entry, *entry; time_t curr_time; - int target = -1; + int target = META_TARGET_NONE; - tmp_entry.dn = ( char * )ndn; + assert( cache ); + assert( ndn ); + + tmp_entry.dn = *ndn; ldap_pvt_thread_mutex_lock( &cache->mutex ); entry = ( struct metadncacheentry * )avl_find( cache->tree, ( caddr_t )&tmp_entry, meta_dncache_cmp ); @@ -156,6 +115,7 @@ meta_dncache_get_target( */ if ( cache->ttl < 0 ) { target = entry->target; + } else { /* @@ -182,7 +142,7 @@ meta_dncache_get_target( int meta_dncache_update_entry( struct metadncache *cache, - const char *ndn, + struct berval *ndn, int target ) { @@ -190,6 +150,9 @@ meta_dncache_update_entry( time_t curr_time = 0L; int err = 0; + assert( cache ); + assert( ndn ); + /* * if cache->ttl < 0, cache never expires; * if cache->ttl = 0 no cache is used; shouldn't get here @@ -203,7 +166,7 @@ meta_dncache_update_entry( curr_time = time( NULL ); } - tmp_entry.dn = ( char * )ndn; + tmp_entry.dn = *ndn; ldap_pvt_thread_mutex_lock( &cache->mutex ); entry = ( struct metadncacheentry * )avl_find( cache->tree, @@ -219,8 +182,8 @@ meta_dncache_update_entry( return -1; } - entry->dn = ch_strdup( ndn ); - if ( entry->dn == NULL ) { + ber_dupbv( &entry->dn, ndn ); + if ( entry->dn.bv_val == NULL ) { ldap_pvt_thread_mutex_unlock( &cache->mutex ); return -1; } @@ -244,17 +207,20 @@ meta_dncache_update_entry( int meta_dncache_delete_entry( struct metadncache *cache, - const char *ndn + struct berval *ndn ) { struct metadncacheentry *entry, tmp_entry; - tmp_entry.dn = ( char * )ndn; + assert( cache ); + assert( ndn ); + + tmp_entry.dn = *ndn; ldap_pvt_thread_mutex_lock( &cache->mutex ); entry = avl_delete( &cache->tree, ( caddr_t )&tmp_entry, meta_dncache_cmp ); - ldap_pvt_thread_mutex_lock( &cache->mutex ); + ldap_pvt_thread_mutex_unlock( &cache->mutex ); if ( entry != NULL ) { meta_dncache_free( ( void * )entry ); @@ -276,6 +242,6 @@ meta_dncache_free( { struct metadncacheentry *entry = ( struct metadncacheentry * )e; - free( entry->dn ); + free( entry->dn.bv_val ); }