From aeeed3da85668d366b9c1347a7ec0c0fe4523880 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 11 Dec 2009 11:05:12 +0000 Subject: [PATCH] Revert prev commit, wrong branch --- contrib/slapd-modules/addpartial/addpartial-overlay.c | 4 ++-- contrib/slapd-modules/lastmod/lastmod.c | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/contrib/slapd-modules/addpartial/addpartial-overlay.c b/contrib/slapd-modules/addpartial/addpartial-overlay.c index 0dde1fc298..309391a119 100644 --- a/contrib/slapd-modules/addpartial/addpartial-overlay.c +++ b/contrib/slapd-modules/addpartial/addpartial-overlay.c @@ -48,7 +48,6 @@ static int addpartial_add( Operation *op, SlapReply *rs) Entry *found = NULL; slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; int rc; - AclCheck ak = { op->ora_e. slap_schema.si_ad_entry, NULL, ACL_WRITE }; toAdd = op->oq_add.rs_e; @@ -56,7 +55,8 @@ static int addpartial_add( Operation *op, SlapReply *rs) addpartial.on_bi.bi_type, toAdd->e_nname.bv_val,0); /* if the user doesn't have access, fall through to the normal ADD */ - if(!access_allowed(op, &ak )) + if(!access_allowed(op, toAdd, slap_schema.si_ad_entry, + NULL, ACL_WRITE, NULL)) { return SLAP_CB_CONTINUE; } diff --git a/contrib/slapd-modules/lastmod/lastmod.c b/contrib/slapd-modules/lastmod/lastmod.c index fdbc1dcd01..030bd0ddf8 100644 --- a/contrib/slapd-modules/lastmod/lastmod.c +++ b/contrib/slapd-modules/lastmod/lastmod.c @@ -148,7 +148,6 @@ lastmod_compare( Operation *op, SlapReply *rs ) slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; lastmod_info_t *lmi = (lastmod_info_t *)on->on_bi.bi_private; Attribute *a; - AclCheck ak; ldap_pvt_thread_mutex_lock( &lmi->lmi_entry_mutex ); @@ -159,12 +158,8 @@ lastmod_compare( Operation *op, SlapReply *rs ) goto return_results; } - ak.ak_e = lmi->lmi_e; - ak.ak_desc = op->oq_compare.rs_ava->aa_desc; - ak.ak_val = &op->oq_compare.rs_ava->aa_value; - ak.ak_access = ACL_COMPARE; - ak.ak_state = NULL; - rs->sr_err = access_allowed( op, &ak ); + rs->sr_err = access_allowed( op, lmi->lmi_e, op->oq_compare.rs_ava->aa_desc, + &op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL ); if ( ! rs->sr_err ) { rs->sr_err = LDAP_INSUFFICIENT_ACCESS; goto return_results; -- 2.39.5