Do not require ac/string.h for lber_pvt.h

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index ed52fc02b00d2d980a9136eb9dd3af0216764cf1..1c68436a0bb9f1cbb9e0989dd24247a4c2c41f7e 100644 (file)
--- 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-2018 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