Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java	(revision 1828439)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java	(revision )
@@ -77,6 +77,8 @@
     private ConfigurationParameters tokenParams = EMPTY;
     private CompositeTokenConfiguration tokenConfiguration;
 
+    private ConfigurationParameters configuration;
+
     @Nonnull
     public static SecurityProviderBuilder newBuilder() {
         return new SecurityProviderBuilder();
@@ -86,6 +88,8 @@
     }
 
     public SecurityProviderBuilder with(@Nonnull ConfigurationParameters configuration) {
+        this.configuration = configuration;
+
         authenticationParams = configuration.getConfigValue(AuthenticationConfiguration.NAME, EMPTY);
         privilegeParams = configuration.getConfigValue(PrivilegeConfiguration.NAME, EMPTY);
 
@@ -181,6 +185,7 @@
         // authorization
         if (authorizationConfiguration == null) {
             authorizationConfiguration = new CompositeAuthorizationConfiguration();
+            ((CompositeAuthorizationConfiguration) authorizationConfiguration).withCompositionType(configuration.getConfigValue("authorizationCompositionType", CompositeAuthorizationConfiguration.CompositionType.AND.toString()));
             authorizationConfiguration.setDefaultConfig(initializeConfiguration(new AuthorizationConfigurationImpl(),
                     securityProvider, rootProvider, treeProvider));
         }