Backout the input exhaustion change, it loops. Still looking for

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 0fcad46726d89d55dafebd8985d71cc1cf40ab36..514a0724e8fa14a2c08242ab2b31a1d5130e932b 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -441,15 +441,18 @@ send_search_result(
                /* send references in search results */
                if( err == LDAP_REFERRAL ) {
                        err = LDAP_PARTIAL_RESULTS;
-                       tmp = text = v2ref( refs );
-                       refs = NULL;
                }
 
+               tmp = text = v2ref( refs );
+               refs = NULL;
+
        } else {
                /* don't send references in search results */
+               assert( refs == NULL );
+               refs = NULL;
+
                if( err == LDAP_REFERRAL ) {
                        err = LDAP_SUCCESS;
-                       refs = NULL;
                }
        }
 
@@ -494,7 +497,7 @@ send_search_entry(
        BerElement      *ber;
        Attribute       *a;
        int             i, rc=-1, bytes;
-       struct acl      *acl;
+       AccessControl   *acl;
        char            *edn;
        int             allattrs;