From c15e10b50189d384436728be9ee17986225882c8 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 14 Apr 2010 10:15:53 -0600 Subject: Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries) https://bugzilla.redhat.com/show_bug.cgi?id=576644 Resolves: bug 576644 Bug Description: segfault while multimaster replication (paired node won't find deleted entries) Reviewed by: rmeggins Fixed by: edewata, nhosoi Branch: Directory_Server_8_2_Branch Fix Description: The delete code stores the actual entry from the entry cache in the pblock as SLAPI_DELETE_BEPREOP_ENTRY so that the be preop plugins can have access to the entry. SLAPI_DELETE_BEPREOP_ENTRY is an alias for SLAPI_ENTRY_PRE_OP which is used by the front-end delete code. When processing a replicated delete operation, and the entry has already been deleted (converted to a tombstone), we needed to restore the original entry in SLAPI_DELETE_BEPREOP_ENTRY so that the front-end code can free it as SLAPI_ENTRY_PRE_OP instead of freeing the actual entry from the cache. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no (cherry picked from commit e50dceb45a2ddffe749b444fa057d93776f882c9) --- ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index c1cb1cf8..e862311e 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -189,6 +189,8 @@ ldbm_back_delete( Slapi_PBlock *pb ) if(ldap_result_code==LDAP_OPERATIONS_ERROR || ldap_result_code==LDAP_INVALID_DN_SYNTAX) { + /* restore original entry so the front-end delete code can free it */ + slapi_pblock_set( pb, SLAPI_DELETE_BEPREOP_ENTRY, orig_entry ); goto error_return; } slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code); @@ -204,6 +206,8 @@ ldbm_back_delete( Slapi_PBlock *pb ) * or that this Operation became a No-Op. */ slapi_pblock_get(pb, SLAPI_RESULT_CODE, &ldap_result_code); + /* restore original entry so the front-end delete code can free it */ + slapi_pblock_set( pb, SLAPI_DELETE_BEPREOP_ENTRY, orig_entry ); goto error_return; } /* the flag could be set in a preop plugin (e.g., USN) */ -- cgit