ITS#6101

diff --git a/CHANGES b/CHANGES
index aae961cf4580444b0090dd47a49608914b974839..93fc93b70114943527cd8b1fa8b8e70990a9d52e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.18 Engineering
        Fixed slapd server URL matching (ITS#5942)
        Fixed slapd subordinate needs a suffix (ITS#6216)
        Fixed slapd tools to properly close database (ITS#6214)
+       Fixed slapd uninitialized SlapReply components (ITS#6101)
        Fixed slapd-ndb startup (ITS#6203)
        Fixed slapd-relay various issues (ITS#6133)
        Fixed slapd-relay response/cleanup callback mismatch (ITS#6154)

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 16b87b40c1e7caa9ff32624c1d6af74aac1e12c7..353edc99820600722153d2dfef30324d94f3fab9 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -616,6 +616,7 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
        assert( LDAP_UNSOLICITED_ERROR( rs->sr_err ) );
 
        rs->sr_type = REP_EXTENDED;
+       rs->sr_rspdata = NULL;
 
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_disconnect %d:%s\n",

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 14e3d25b6eaf7885fe0fb439c4f5a9b8f4ebcdbd..e12a82946fad2fbc7ae0c9caa64b128f95ea5692 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1540,7 +1540,7 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
                }
 
                /* Must send response using old security layer */
-               if (response.bv_len) rs->sr_sasldata = &response;
+               rs->sr_sasldata = (response.bv_len ? &response : NULL);
                send_ldap_sasl( op, rs );
                
                /* Now dispose of the old security layer.

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 288d18f3ded07b77351b48850a18d8fd26eb03bf..65716aabcbec4e00198795e82424f1feb16f130a 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2064,9 +2064,9 @@ struct SlapReply {
        BerVarray sr_ref;
        LDAPControl **sr_ctrls;
        union sr_u {
+               rep_search_s sru_search;
                rep_sasl_s sru_sasl;
                rep_extended_s sru_extended;
-               rep_search_s sru_search;
        } sr_un;
        slap_mask_t sr_flags;
 #define REP_ENTRY_MODIFIABLE   0x0001U