upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#5161

Browse source
This commit is contained in:
Quanah Gibson-Mount 2007-12-11 04:17:07 +00:00
parent 28987a6989
commit 741a6e117e
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -4,6 +4,7 @@ OpenLDAP 2.3.40 Engineering
Fixed slapd-bdb/hdb slapadd hang (ITS#5225)
Fixed slapd-bdb/hdb dn2entry lock bug (ITS#5257)
Fixed slapd-bdb/hdb dn2id lock bug (ITS#5262)
Fixed slapo-accesslog abandoned op cleanup (ITS#5161)
Fixed slapo-translucent interactions with slapo-rwm (ITS#4889)
Documentation
Fixed slapd.conf(5) maxderefdepth default value typo (ITS#5200)

29
servers/slapd/overlays/accesslog.c
View file

@ -60,6 +60,7 @@ typedef struct log_info {
Filter *li_oldf;
Entry *li_old;
int li_success;
int li_unlock;
ldap_pvt_thread_mutex_t li_op_mutex;
ldap_pvt_thread_mutex_t li_log_mutex;
} log_info;
@ -913,6 +914,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
ldap_pvt_thread_mutex_lock( &li->li_log_mutex );
old = li->li_old;
li->li_old = NULL;
li->li_unlock = 0;
ldap_pvt_thread_mutex_unlock( &li->li_op_mutex );
}
@ -1223,6 +1225,25 @@ accesslog_op_bind( Operation *op, SlapReply *rs )
return SLAP_CB_CONTINUE;
}
static int
accesslog_mod_cleanup( Operation *op, SlapReply *rs )
{
slap_callback *sc = op->o_callback;
slap_overinst *on = sc->sc_private;
log_info *li = on->on_bi.bi_private;
op->o_callback = sc->sc_next;
op->o_tmpfree( sc, op->o_tmpmemctx );
if ( li->li_unlock ) {
BackendInfo *bi = op->o_bd->bd_info;
op->o_bd->bd_info = (BackendInfo *)on;
accesslog_response( op, rs );
op->o_bd->bd_info = bi;
}
return 0;
}
static int
accesslog_op_mod( Operation *op, SlapReply *rs )
{
@ -1230,10 +1251,18 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
log_info *li = on->on_bi.bi_private;
if ( li->li_ops & LOG_OP_WRITES ) {
slap_callback *cb = op->o_tmpalloc( sizeof( slap_callback ), op->o_tmpmemctx );
cb->sc_cleanup = accesslog_mod_cleanup;
cb->sc_response = NULL;
cb->sc_private = on;
cb->sc_next = op->o_callback;
op->o_callback = cb;
/* FIXME: this needs to be a recursive mutex to allow
* overlays like refint to keep working.
*/
ldap_pvt_thread_mutex_lock( &li->li_op_mutex );
li->li_unlock = 1;
if ( li->li_oldf && ( op->o_tag == LDAP_REQ_DELETE ||
op->o_tag == LDAP_REQ_MODIFY )) {
int rc;