X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fcompare.c;h=02666f9bb379aaa58d335fbd20c7d649196a71cb;hb=c6f12694fc959cde780fe83adfa535cce7998b89;hp=966b9188c7954e159f492bedd707b346c5c5427c;hpb=68c5f6fa985c9ea5ef2ff52ccee75b26741fea27;p=openldap diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c index 966b9188c7..02666f9bb3 100644 --- a/servers/slapd/back-ldap/compare.c +++ b/servers/slapd/back-ldap/compare.c @@ -1,38 +1,24 @@ /* compare.c - ldap backend compare function */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 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 2003-2008 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,69 +33,52 @@ int ldap_back_compare( - Operation *op, - SlapReply *rs ) + Operation *op, + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private; - struct ldapconn *lc; - struct berval mapped_at, mapped_val; - struct berval mdn = { 0, NULL }; - ber_int_t msgid; - int freeval = 0; - dncookie dc; + ldapinfo_t *li = (ldapinfo_t *)op->o_bd->be_private; + + ldapconn_t *lc = NULL; + ber_int_t msgid; + ldap_back_send_t retrying = LDAP_BACK_RETRYING; + LDAPControl **ctrls = NULL; + int rc = LDAP_SUCCESS; - lc = ldap_back_getconn(op, rs); - if (!lc || !ldap_back_dobind( lc, op, rs ) ) { - return( -1 ); + if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) { + lc = NULL; + goto cleanup; } - /* - * Rewrite the compare dn, if needed - */ - dc.li = li; -#ifdef ENABLE_REWRITE - dc.conn = op->o_conn; - dc.rs = rs; - dc.ctx = "compareDn"; -#else - dc.tofrom = 1; - dc.normalized = 0; -#endif - if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) { +retry: + ctrls = op->o_ctrls; + rc = ldap_back_controls_add( op, rs, lc, &ctrls ); + if ( rc != LDAP_SUCCESS ) { send_ldap_result( op, rs ); - return -1; + goto cleanup; } - if ( op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_objectClass ) { - ldap_back_map(&li->oc_map, &op->orc_ava->aa_value, &mapped_val, - BACKLDAP_MAP); - if (mapped_val.bv_val == NULL || mapped_val.bv_val[0] == '\0') { - return( -1 ); - } - mapped_at = op->orc_ava->aa_desc->ad_cname; - } else { - ldap_back_map(&li->at_map, &op->orc_ava->aa_desc->ad_cname, &mapped_at, - BACKLDAP_MAP); - if (mapped_at.bv_val == NULL || mapped_at.bv_val[0] == '\0') { - return( -1 ); - } - if (op->orc_ava->aa_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) { -#ifdef ENABLE_REWRITE - dc.ctx = "dnAttr"; -#endif - ldap_back_dn_massage( &dc, &op->orc_ava->aa_value, &mapped_val ); - if (mapped_val.bv_val == NULL || mapped_val.bv_val[0] == '\0') { - mapped_val = op->orc_ava->aa_value; - } + rs->sr_err = ldap_compare_ext( lc->lc_ld, op->o_req_dn.bv_val, + op->orc_ava->aa_desc->ad_cname.bv_val, + &op->orc_ava->aa_value, + ctrls, NULL, &msgid ); + rc = ldap_back_op_result( lc, op, rs, msgid, + li->li_timeout[ SLAP_OP_COMPARE ], + ( LDAP_BACK_SENDRESULT | retrying ) ); + if ( rc == LDAP_UNAVAILABLE && retrying ) { + retrying &= ~LDAP_BACK_RETRYING; + if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) { + /* if the identity changed, there might be need to re-authz */ + (void)ldap_back_controls_free( op, rs, &ctrls ); + goto retry; } } - rs->sr_err = ldap_compare_ext( lc->ld, mdn.bv_val, mapped_at.bv_val, - &mapped_val, op->o_ctrls, NULL, &msgid ); - - if ( mdn.bv_val != op->o_req_dn.bv_val ) { - free( mdn.bv_val ); - } +cleanup: + (void)ldap_back_controls_free( op, rs, &ctrls ); - return( ldap_back_op_result( lc, op, rs, msgid, 1 ) ); + if ( lc != NULL ) { + ldap_back_release_conn( li, lc ); + } + + return rs->sr_err; }