X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=67340f2f5ef9bf28e5e374045f0568f725c86d9c;hb=8300eee0179798abe4a55cad6170044d1a80cf99;hp=ed52fc02b00d2d980a9136eb9dd3af0216764cf1;hpb=bfd8b3a42aa44d317acd686e786ed4be681b2337;p=openldap

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index ed52fc02b0..67340f2f5e 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -185,9 +185,14 @@ do_modrdn(
 	op->o_bd = frontendDB;
 	rs->sr_err = frontendDB->be_modrdn( op, rs );
 
+	if ( rs->sr_err == SLAPD_ASYNCOP ) {
+		/* skip cleanup */
+		return rs->sr_err;
+	}
 #ifdef LDAP_X_TXN
 	if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) {
 		/* skip cleanup */
+		return rs->sr_err;
 	}
 #endif