mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-27 01:02:53 -05:00
ITS#6518 Only remove proxyauthz control if we generated one ourselves
This commit is contained in:
parent
4da575d451
commit
1aecfe0b8f
3 changed files with 6 additions and 3 deletions
|
|
@ -1348,7 +1348,8 @@ asyncmeta_controls_add( Operation *op,
|
|||
LDAP_CONTROL_PROXY_AUTHZ, op->o_ctrls, NULL );
|
||||
|
||||
for ( i = 0; op->o_ctrls[ i ]; i++ ) {
|
||||
if ( proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Only replace it if we generated one */
|
||||
if ( j1 && proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Frontend has already checked only one is present */
|
||||
assert( skipped == 0 );
|
||||
skipped++;
|
||||
|
|
|
|||
|
|
@ -2897,7 +2897,8 @@ ldap_back_controls_add(
|
|||
LDAP_CONTROL_PROXY_AUTHZ, op->o_ctrls, NULL );
|
||||
|
||||
for ( i = 0; op->o_ctrls[ i ]; i++ ) {
|
||||
if ( proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Only replace it if we generated one */
|
||||
if ( j1 && proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Frontend has already checked only one is present */
|
||||
assert( skipped == 0 );
|
||||
skipped++;
|
||||
|
|
|
|||
|
|
@ -1723,7 +1723,8 @@ meta_back_controls_add(
|
|||
LDAP_CONTROL_PROXY_AUTHZ, op->o_ctrls, NULL );
|
||||
|
||||
for ( i = 0; op->o_ctrls[ i ]; i++ ) {
|
||||
if ( proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Only replace it if we generated one */
|
||||
if ( j1 && proxyauthz && proxyauthz == op->o_ctrls[ i ] ) {
|
||||
/* Frontend has already checked only one is present */
|
||||
assert( skipped == 0 );
|
||||
skipped++;
|
||||
|
|
|
|||
Loading…
Reference in a new issue