mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6656 keep loginfo mutex-protected

Browse Source
This commit is contained in:
Pierangelo Masarati 2012-04-11 00:15:36 +02:00
parent 3d99878d0b
commit a47ef8d2b7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servers/slapd/overlays/accesslog.c
View File

@ -1437,7 +1437,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
log_info *li = on->on_bi.bi_private;
Attribute *a, *last_attr;
Modifications *m;
struct berval *b;
struct berval *b, uuid = BER_BVNULL;
int i;
int logop;
slap_verbmasks *lo;
@ -1488,7 +1488,9 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
ldap_pvt_thread_mutex_lock( &li->li_log_mutex );
old = li->li_old;
uuid = li->li_uuid;
li->li_old = NULL;
BER_BVZERO( &li->li_uuid );
/* Disarm mod_cleanup */
for ( cb = op->o_callback; cb; cb = cb->sc_next ) {
if ( cb->sc_private == (void *)on ) {
@ -1784,11 +1786,11 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
break;
}
if ( e_uuid || !BER_BVISNULL( &li->li_uuid ) ) {
if ( e_uuid || !BER_BVISNULL( &uuid ) ) {
struct berval *pbv;
if ( !BER_BVISNULL( &li->li_uuid ) ) {
pbv = &li->li_uuid;
if ( !BER_BVISNULL( &uuid ) ) {
pbv = &uuid;
} else {
a = attr_find( e_uuid->e_attrs, slap_schema.si_ad_entryUUID );
@ -1801,9 +1803,9 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
attr_merge_normalize_one( e, ad_reqEntryUUID, pbv, op->o_tmpmemctx );
}
if ( !BER_BVISNULL( &li->li_uuid ) ) {
ber_memfree( li->li_uuid.bv_val );
BER_BVZERO( &li->li_uuid );
if ( !BER_BVISNULL( &uuid ) ) {
ber_memfree( uuid.bv_val );
BER_BVZERO( &uuid );
}
}