Commit d72244cd authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5319

parent 88590f7d
...@@ -20,6 +20,7 @@ OpenLDAP 2.4.8 Engineering ...@@ -20,6 +20,7 @@ OpenLDAP 2.4.8 Engineering
Fixed slapd NULL set values (ITS#5286) Fixed slapd NULL set values (ITS#5286)
Fixed slapd segv with SASL/OTP (ITS#5259) Fixed slapd segv with SASL/OTP (ITS#5259)
Fixed slapd-bdb segv with bdb4.6 (ITS#5322) Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
Fixed slapd-bdb modrdn to same dn (ITS#5319)
Added slapd-bdb/slapd-hdb DB encryption (ITS#5359) Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
Fixed slapd-ldif delete (ITS#5265) Fixed slapd-ldif delete (ITS#5265)
Fixed slapd-monitor crash (ITS#5311) Fixed slapd-monitor crash (ITS#5311)
......
...@@ -559,6 +559,9 @@ retry: /* transaction retry */ ...@@ -559,6 +559,9 @@ retry: /* transaction retry */
case DB_NOTFOUND: case DB_NOTFOUND:
break; break;
case 0: case 0:
/* Allow rename to same DN */
if ( nei == ei )
break;
rs->sr_err = LDAP_ALREADY_EXISTS; rs->sr_err = LDAP_ALREADY_EXISTS;
goto return_results; goto return_results;
default: default:
......
...@@ -261,6 +261,36 @@ case $RC in ...@@ -261,6 +261,36 @@ case $RC in
;; ;;
esac esac
echo "Testing modrdn with newRdn exact same as target..."
$LDAPMODRDN -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com' 'cn=James A Jones 1'
RC=$?
case $RC in
0)
;;
*)
echo "ldapmodrdn failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
;;
esac
echo "Testing modrdn with newRdn same as target, changed case..."
$LDAPMODRDN -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com' 'cn=James A JONES 1'
RC=$?
case $RC in
0)
;;
*)
echo "ldapmodrdn failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
;;
esac
test $KILLSERVERS != no && kill -HUP $KILLPIDS test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo ">>>>> Test succeeded" echo ">>>>> Test succeeded"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment