diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2021-03-31 08:24:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 08:24:26 +0200 |
| commit | a8fee2a21a93fa1a8acb072c03a3cb94b0b0e87f (patch) | |
| tree | a277aa3295b9eeb14a68dbfaf1b92debad4f9d06 /config-model | |
| parent | b875c9c53cf33f888345d8fe6f28374d90daef31 (diff) | |
| parent | 2791e1a4fb16dc74a1c74ae35d3a09414668f506 (diff) | |
Merge pull request #17241 from vespa-engine/mortent/remove-client-auth-override-flag
Remove use of flag use-access-control-client-authentication
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index d03246b4e8c..d713ae2e016 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -435,8 +435,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } EndpointCertificateSecrets endpointCertificateSecrets = deployState.endpointCertificateSecrets().get(); - boolean enforceHandshakeClientAuth = context.properties().featureFlags().useAccessControlTlsHandshakeClientAuth() && - cluster.getHttp().getAccessControl() + boolean enforceHandshakeClientAuth = cluster.getHttp().getAccessControl() .map(accessControl -> accessControl.clientAuthentication) .map(clientAuth -> clientAuth.equals(AccessControl.ClientAuthentication.need)) .orElse(false); |