ITS#5688

diff --git a/CHANGES b/CHANGES
index 02fa6045d2e116ee5587629320f415530d94ba78..32b0fb0879c40b69d5284463a79b7b27823f3639 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.12 Engineering
        Fixed slapd objectClass canonicalization (ITS#5681)
        Fixed slapd objectClass termination (ITS#5682)
        Fixed slapd overlay control registration (ITS#5649)
+       Fixed slapd spurious text output (ITS#5688)
        Fixed slapd socket closing on Windows (ITS#5606)
        Fixed slapd sortvals comparison (ITS#5578)
        Fixed slapd syncrepl contextCSN detection (ITS#5675)

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index bad4e7706695d5dd00814a8bfdaa8a61dbe05b21..27589744227862f29a49f5e5f8c7068f533b1ff3 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -111,6 +111,7 @@ get_ava(
                Debug( LDAP_DEBUG_FILTER,
                "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
                ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
+               *text = NULL;
                rc = LDAP_SUCCESS;
        }
 

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 60f4f0e063b8e944387fe98c1061322b1d02ba80..0a76e2bdd617ad181957297858a88747d6e15c50 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -478,6 +478,7 @@ return_error:
                        return rc;
                }
 
+               *text = NULL;
                rc = LDAP_SUCCESS;
        }