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

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 8958a581dee382a9c235640d650c1cdcfc5e300e..ac05d877c44aa7cf6453a2b141fe7bffa7a0e2f7 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.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
@@ -175,6 +175,10 @@ do_modify(
 
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_modify( 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 ) {
@@ -747,7 +751,6 @@ slap_sort_vals(
                                if ( match == 0 ) goto done;
                        }
                        if ( jstack == 0 ) break;
-                       if ( match == 0 ) break;
                        ir = istack[jstack--];
                        l = istack[jstack--];
                } else {