Skip to content

Commit

Permalink
Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when m…
Browse files Browse the repository at this point in the history
…oving ldap entry

https://fedorahosted.org/389/ticket/520

Fix description: The code to check if the new superior entry exists
or not was returning the "No such object" error only when the op
was requested by the directory manager.  This patch is removing
the condition so that whoever the requester is, it returns the error.
  • Loading branch information
Noriko Hosoi committed Nov 14, 2012
1 parent f026ef0 commit 40e68b1
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
Expand Up @@ -549,10 +549,11 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( newparententry == NULL )
{
/* There may not be a new parent because we don't intend there to be one. */
if(slapi_sdn_get_ndn(dn_newsuperiordn)!=NULL)
if (slapi_sdn_get_dn(dn_newsuperiordn))
{
/* If the new entry is to be a suffix, and we're root, then it's OK that the new parent doesn't exist */
if (!(slapi_be_issuffix(pb->pb_backend, &dn_newdn)) && isroot)
/* If the new entry is not to be a suffix,
* return an error no matter who requested this modrdn */
if (!slapi_be_issuffix(pb->pb_backend, &dn_newdn))
{
/* Here means that we didn't find the parent */
int err = 0;
Expand All @@ -570,7 +571,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
slapi_sdn_get_ndn(dn_newsuperiordn), 0 );
slapi_sdn_done(&ancestorsdn);
goto error_return;
}
}
}
}
else
Expand All @@ -588,7 +589,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( parententry == NULL )
{
/* If the entry a suffix, and we're root, then it's OK that the parent doesn't exist */
if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && isroot)
if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && !isroot)
{
/* Here means that we didn't find the parent */
ldap_result_matcheddn = "NULL";
Expand Down

0 comments on commit 40e68b1

Please sign in to comment.