ITS#7906 better fix

[openldap] / servers / slapd / back-mdb / modrdn.c

diff --git a/servers/slapd/back-mdb/modrdn.c b/servers/slapd/back-mdb/modrdn.c
index de3a219721d181c318b437b07237ef5885595626..3bf46ea69ac48f68e0d4f6bd41ee00fc7b812ced 100644 (file)
--- a/servers/slapd/back-mdb/modrdn.c
+++ b/servers/slapd/back-mdb/modrdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2013 The OpenLDAP Foundation.
+ * Copyright 2000-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -492,7 +492,7 @@ txnReturn:
 
        /* add new DN */
        rs->sr_err = mdb_dn2id_add( op, mc, mc, np ? np->e_id : p->e_id,
-               np ? nsubs : 0, &dummy );
+               nsubs, np != NULL, &dummy );
        if ( rs->sr_err != 0 ) {
                Debug(LDAP_DEBUG_TRACE,
                        "<=- " LDAP_XSTRING(mdb_modrdn)
@@ -656,6 +656,8 @@ done:
                if ( opinfo.moi_oe.oe_key ) {
                        LDAP_SLIST_REMOVE( &op->o_extra, &opinfo.moi_oe, OpExtra, oe_next );
                }
+       } else {
+               moi->moi_ref--;
        }
 
        if( preread_ctrl != NULL && (*preread_ctrl) != NULL ) {