Commit a56c7ffc authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6101

parent f5a911d1
......@@ -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)
......
......@@ -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",
......
......@@ -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.
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment