ITS#9000 memberof: noop a noop rename

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 93e8eca65ca6c0ac5c4ec6421469810aceb07424..16239a5eb606c17c38f507c0182f59b5984bb6d6 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -364,6 +364,12 @@ memberof_value_modify(
        struct berval   values[ 4 ], nvalues[ 4 ];
        int             mcnt = 0;
 
+       if ( old_ndn != NULL && new_ndn != NULL &&
+               ber_bvcmp( old_ndn, new_ndn ) == 0 ) {
+           /* DNs compare equal, it's a noop */
+           return;
+       }
+
        op2.o_tag = LDAP_REQ_MODIFY;
 
        op2.o_req_dn = *ndn;

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 188bf38359912d54d8ec25f7bc5e09baad921573..4aaf3b49efbbb8906df11aebd49fa93543d0555a 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -260,6 +260,11 @@ $LDAPMODIFY -h $LOCALHOST -p $PORT1 \
        >> $TESTOUT 2>&1 << EOF
 dn: cn=Cartoonia,ou=Groups,$BASEDN
 changetype: modrdn
+newrdn: cn=Toon town
+deleteoldrdn: 1
+
+dn: cn=Toon town,ou=Groups,$BASEDN
+changetype: modrdn
 newrdn: cn=Toon Town
 deleteoldrdn: 1
 EOF