X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Funbind.c;h=97f26bc7db9a7c030bb61e07bce609f26887568d;hb=be53e8265065e7de61a0996e37732f44e22fdec7;hp=e4f381e988d376874aac7187314666066e45a1b0;hpb=1abb8cb3397c543201a421c5a229304b9d3aded3;p=openldap diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c index e4f381e988..97f26bc7db 100644 --- a/servers/slapd/back-meta/unbind.c +++ b/servers/slapd/back-meta/unbind.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. - * - * 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. + * Copyright 1999-2005 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 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 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" @@ -70,6 +26,7 @@ #include #include +#include #include "slap.h" #include "../back-ldap/back-ldap.h" @@ -77,56 +34,43 @@ int meta_back_conn_destroy( - Backend *be, - Connection *conn -) + Backend *be, + Connection *conn ) { - struct metainfo *li = ( struct metainfo * )be->be_private; - struct metaconn *lc, lc_curr; + metainfo_t *mi = ( metainfo_t * )be->be_private; + metaconn_t *mc, + mc_curr = { 0 }; -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, ENTRY, - "meta_back_conn_destroy: fetching conn %ld\n", conn->c_connid, 0, 0 ); -#else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_TRACE, - "=>meta_back_conn_destroy: fetching conn %ld\n%s%s", - conn->c_connid, "", "" ); -#endif /* !NEW_LOGGING */ + "=>meta_back_conn_destroy: fetching conn %ld\n", + conn->c_connid, 0, 0 ); - lc_curr.conn = conn; + mc_curr.mc_conn = conn; - ldap_pvt_thread_mutex_lock( &li->conn_mutex ); - lc = avl_delete( &li->conntree, ( caddr_t )&lc_curr, + ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex ); + mc = avl_delete( &mi->mi_conntree, ( caddr_t )&mc_curr, meta_back_conn_cmp ); - ldap_pvt_thread_mutex_unlock( &li->conn_mutex ); + ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex ); + + if ( mc ) { + int i; - if ( lc ) { - int i; - -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, INFO, - "meta_back_conn_destroy: destroying conn %ld\n", - lc->conn->c_connid, 0, 0 ); -#else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_TRACE, - "=>meta_back_conn_destroy: destroying conn %ld\n%s%s", - lc->conn->c_connid, "", "" ); -#endif /* !NEW_LOGGING */ + "=>meta_back_conn_destroy: destroying conn %ld\n", + mc->mc_conn->c_connid, 0, 0 ); /* * Cleanup rewrite session */ - for ( i = 0; i < li->ntargets; ++i ) { - if ( lc->conns[ i ].ld == NULL ) { + for ( i = 0; i < mi->mi_ntargets; ++i ) { + if ( mc->mc_conns[ i ].msc_ld == NULL ) { continue; } - rewrite_session_delete( li->targets[ i ]->rwinfo, conn ); - meta_clear_one_candidate( &lc->conns[ i ], 1 ); + rewrite_session_delete( mi->mi_targets[ i ].mt_rwmap.rwm_rw, conn ); + meta_clear_one_candidate( &mc->mc_conns[ i ] ); } - - free( lc->conns ); - free( lc ); + meta_back_conn_free( mc ); } /* no response to unbind */