mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
check for NULL dn in URL; set error code before seding extended response (partially addresses ITS#4968)
This commit is contained in:
parent
d9a43aee44
commit
c30ae47206
@ -418,7 +418,7 @@ ldap_chain_op(
|
||||
LDAPURLDesc *srv = NULL;
|
||||
struct berval save_req_dn = op->o_req_dn,
|
||||
save_req_ndn = op->o_req_ndn,
|
||||
dn,
|
||||
dn = BER_BVNULL,
|
||||
pdn = BER_BVNULL,
|
||||
ndn = BER_BVNULL;
|
||||
int temporary = 0;
|
||||
@ -449,6 +449,9 @@ Document: RFC 4511
|
||||
}
|
||||
|
||||
/* normalize DN */
|
||||
rc = LDAP_SUCCESS;
|
||||
srv->lud_scope = LDAP_SCOPE_DEFAULT;
|
||||
if ( srv->lud_dn != NULL ) {
|
||||
ber_str2bv( srv->lud_dn, 0, 0, &dn );
|
||||
rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, op->o_tmpmemctx );
|
||||
if ( rc == LDAP_SUCCESS ) {
|
||||
@ -456,10 +459,14 @@ Document: RFC 4511
|
||||
* ldap_initialize() will parse the URL
|
||||
* as a comma-separated URL list */
|
||||
srv->lud_dn = "";
|
||||
srv->lud_scope = LDAP_SCOPE_DEFAULT;
|
||||
}
|
||||
|
||||
} else {
|
||||
srv->lud_dn = "";
|
||||
}
|
||||
|
||||
li.li_uri = ldap_url_desc2str( srv );
|
||||
srv->lud_dn = dn.bv_val;
|
||||
}
|
||||
ldap_free_urldesc( srv );
|
||||
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
@ -629,6 +636,8 @@ ldap_chain_search(
|
||||
}
|
||||
|
||||
/* normalize DN */
|
||||
rc = LDAP_INVALID_SYNTAX;
|
||||
if ( srv->lud_dn != NULL ) {
|
||||
ber_str2bv( srv->lud_dn, 0, 0, &dn );
|
||||
rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, op->o_tmpmemctx );
|
||||
if ( rc == LDAP_SUCCESS ) {
|
||||
@ -640,6 +649,7 @@ ldap_chain_search(
|
||||
li.li_uri = ldap_url_desc2str( srv );
|
||||
srv->lud_dn = dn.bv_val;
|
||||
}
|
||||
}
|
||||
ldap_free_urldesc( srv );
|
||||
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
@ -918,6 +928,7 @@ ldap_chain_response( Operation *op, SlapReply *rs )
|
||||
* to send it... */
|
||||
/* FIXME: what about chaining? */
|
||||
if ( rc != SLAPD_ABANDON ) {
|
||||
rs->sr_err = rc;
|
||||
send_ldap_extended( op, rs );
|
||||
rc = LDAP_SUCCESS;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user