mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-21 14:25:24 -05:00
protect all occurrences of ACL_DISCLOSE
This commit is contained in:
parent
59c40035fd
commit
53ce94a25d
3 changed files with 12 additions and 3 deletions
|
|
@ -2241,6 +2241,10 @@ str2access( const char *str )
|
|||
return ACL_NONE;
|
||||
|
||||
} else if ( strcasecmp( str, "disclose" ) == 0 ) {
|
||||
#ifndef SLAP_ACL_HONOR_DISCLOSE
|
||||
fprintf( stderr, "str2access: warning, "
|
||||
"\"disclose\" privilege disabled.\n" );
|
||||
#endif /* SLAP_ACL_HONOR_DISCLOSE */
|
||||
return ACL_DISCLOSE;
|
||||
|
||||
} else if ( strcasecmp( str, "auth" ) == 0 ) {
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ dn2entry_retry:
|
|||
{
|
||||
rs->sr_err = LDAP_NO_SUCH_OBJECT;
|
||||
} else
|
||||
#endif
|
||||
#endif /* SLAP_ACL_HONOR_DISCLOSE */
|
||||
{
|
||||
rs->sr_err = LDAP_ASSERTION_FAILED;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,14 +86,17 @@ ldbm_back_search(
|
|||
|
||||
if ( matched != NULL ) {
|
||||
BerVarray erefs = NULL;
|
||||
|
||||
|
||||
#ifdef SLAP_ACL_HONOR_DISCLOSE
|
||||
if ( ! access_allowed( op, matched,
|
||||
slap_schema.si_ad_entry,
|
||||
NULL, ACL_DISCLOSE, NULL ) )
|
||||
{
|
||||
rs->sr_err = LDAP_NO_SUCH_OBJECT;
|
||||
|
||||
} else {
|
||||
} else
|
||||
#endif /* SLAP_ACL_HONOR_DISCLOSE */
|
||||
{
|
||||
ber_dupbv( &matched_dn, &matched->e_name );
|
||||
|
||||
erefs = is_entry_referral( matched )
|
||||
|
|
@ -127,6 +130,7 @@ ldbm_back_search(
|
|||
return rs->sr_err;
|
||||
}
|
||||
|
||||
#ifdef SLAP_ACL_HONOR_DISCLOSE
|
||||
if ( ! access_allowed( op, e, slap_schema.si_ad_entry,
|
||||
NULL, ACL_DISCLOSE, NULL ) )
|
||||
{
|
||||
|
|
@ -138,6 +142,7 @@ ldbm_back_search(
|
|||
send_ldap_result( op, rs );
|
||||
return rs->sr_err;
|
||||
}
|
||||
#endif /* SLAP_ACL_HONOR_DISCLOSE */
|
||||
|
||||
if ( !manageDSAit && is_entry_referral( e ) ) {
|
||||
/* entry is a referral, don't allow add */
|
||||
|
|
|
|||
Loading…
Reference in a new issue