#437 variable dn should not be used in ldbm_back_delete
Closed: Fixed None Opened 7 years ago by rmeggins.

The variable
char *dn = NULL;
appears to be used in several places in ldbm_back_delete - perhaps references to this variable were not changed to sdn or sdnp when the code was converted to use Slapi_DN instead of string dns?


Thanks, Rich. You are right. That's a bug -- cleaning up was not enough. :(

We can get rid of "Slapi_DN sdn" and set dn from sdnp passed via SLAPI_DELETE_TARGET_SDN: "dn = slapi_sdn_get_dn(sdnp);"

Added initial screened field value.

Fix description: When SLAPI_DELETE_TARGET_DN was replaced with
SLAPI_DELETE_TARGET_SDN, removing obsolete variable dn was
incomplete. Actually, the variable dn is still referred in
some error messages. This patch sets the value from Slapi_DN
to the dn variable.

Reviewed by Rich (Thank you!!)

Pushed to master.

$ git merge trac437
Updating ba92e52..b37e0c2
Fast-forward
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)

$ git push
Counting objects: 13, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 925 bytes, done.
Total 7 (delta 5), reused 0 (delta 0)
To ssh://git.fedorahosted.org/git/389/ds.git
ba92e52..b37e0c2 master -> master

Pushed to 1.2.11 branch, as well.

$ git cherry-pick -x -e b37e0c2
[389-ds-base-1.2.11-ext 20be9c4] Trac Ticket #437 - variable dn should not be used in ldbm_back_delete
1 file changed, 6 insertions(+), 14 deletions(-)

$ git push origin 389-ds-base-1.2.11-ext:389-ds-base-1.2.11
Counting objects: 13, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 976 bytes, done.
Total 7 (delta 5), reused 0 (delta 0)
To ssh://git.fedorahosted.org/git/389/ds.git
ba1f5b2..20be9c4 389-ds-base-1.2.11-ext -> 389-ds-base-1.2.11

Metadata Update from @nhosoi:
- Issue assigned to nhosoi
- Issue set to the milestone: 1.2.11.12

2 years ago

Login to comment on this ticket.

Metadata