mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7080 Do not munge path twice

Browse Source
This commit is contained in:
Ondřej Kuzník 2024-10-24 15:59:37 +01:00 committed by Quanah Gibson-Mount
parent 2ba10ad59c
commit 86d23423ac
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
servers/slapd/back-ldif/ldif.c
View File

@ -1576,28 +1576,6 @@ ldif_back_delete( Operation *op, SlapReply *rs )
goto done; goto done;
} }
rc = ndn2path( op, &op->o_req_ndn, &path, 0 );
if ( rc != LDAP_SUCCESS ) {
goto done;
}
ldif2dir_len( path );
ldif2dir_name( path );
if ( rmdir( path.bv_val ) < 0 ) {
switch ( errno ) {
case ENOTEMPTY:
rc = LDAP_NOT_ALLOWED_ON_NONLEAF;
break;
case ENOENT:
/* is leaf, go on */
break;
default:
rc = LDAP_OTHER;
rs->sr_text = "internal error (cannot delete subtree directory)";
break;
}
}
/* pre-read */ /* pre-read */
if ( op->o_preread ) { if ( op->o_preread ) {
Entry *e = NULL; Entry *e = NULL;
@ -1620,6 +1598,29 @@ ldif_back_delete( Operation *op, SlapReply *rs )
} }
} }
entry_free( e ); entry_free( e );
} else {
rc = ndn2path( op, &op->o_req_ndn, &path, 0 );
}
if ( rc != LDAP_SUCCESS ) {
goto done;
}
ldif2dir_len( path );
ldif2dir_name( path );
if ( rmdir( path.bv_val ) < 0 ) {
switch ( errno ) {
case ENOTEMPTY:
rc = LDAP_NOT_ALLOWED_ON_NONLEAF;
break;
case ENOENT:
/* is leaf, go on */
break;
default:
rc = LDAP_OTHER;
rs->sr_text = "internal error (cannot delete subtree directory)";
break;
}
} }
if ( rc == LDAP_SUCCESS ) { if ( rc == LDAP_SUCCESS ) {