ITS#6132: Fix slapi_entry_has_children()

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 115b4705ee9c8a9875c78b5a35629656a6e53467..2710ffe79969d1491d9aec60b0311fed60495063 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -268,6 +268,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
        if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                        "modify/increment not supported in context" );
+               goto cleanup;
        }
 
        /*
@@ -807,7 +808,7 @@ slap_sort_vals(
                }
        }
        done:
-       if ( i >= 0 )
+       if ( match == 0 && i >= 0 )
                *dup = ix[i];
 
        /* For sorted attributes, put the values in index order */