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

ITS#6540

parent bf7ebde7
...@@ -31,6 +31,7 @@ OpenLDAP 2.4.24 Engineering ...@@ -31,6 +31,7 @@ OpenLDAP 2.4.24 Engineering
Fixed slapd-ldap debug output of timeout (ITS#6721) Fixed slapd-ldap debug output of timeout (ITS#6721)
Fixed slapd-ldap DNSSRV referral chaining (ITS#6565) Fixed slapd-ldap DNSSRV referral chaining (ITS#6565)
Fixed slapd-ldap chaining with onelevel scope (ITS#6699) Fixed slapd-ldap chaining with onelevel scope (ITS#6699)
Fixed slapd-ldap chaining with ppolicy (ITS#6540)
Fixed slapd-ldap with SASL/EXTERNAL (ITS#6642) Fixed slapd-ldap with SASL/EXTERNAL (ITS#6642)
Fixed slapd-ndb to honor rootpw setting (ITS#6661) Fixed slapd-ndb to honor rootpw setting (ITS#6661)
Fixed slapd-meta anon retry with failed auth method (ITS#6643) Fixed slapd-meta anon retry with failed auth method (ITS#6643)
......
...@@ -1262,6 +1262,7 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca ) ...@@ -1262,6 +1262,7 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
assert( rc == LDAP_SUCCESS ); assert( rc == LDAP_SUCCESS );
at = attr_find( e->e_attrs, ad ); at = attr_find( e->e_attrs, ad );
#if 0
if ( lc->lc_common_li == NULL && at != NULL ) { if ( lc->lc_common_li == NULL && at != NULL ) {
/* FIXME: we should generate an empty default entry /* FIXME: we should generate an empty default entry
* if none is supplied */ * if none is supplied */
...@@ -1272,7 +1273,9 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca ) ...@@ -1272,7 +1273,9 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
rc = LDAP_CONSTRAINT_VIOLATION; rc = LDAP_CONSTRAINT_VIOLATION;
goto done; goto done;
} else if ( lc->lc_common_li != NULL && at == NULL ) { } else
#endif
if ( lc->lc_common_li != NULL && at == NULL ) {
/* FIXME: we should generate an empty default entry /* FIXME: we should generate an empty default entry
* if none is supplied */ * if none is supplied */
Debug( LDAP_DEBUG_ANY, "slapd-chain: " Debug( LDAP_DEBUG_ANY, "slapd-chain: "
......
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