roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [roller] branch roller-5.2.x updated: Oops. Did not mean to switch to LDAP as default.
Date Sun, 12 May 2019 13:22:35 GMT
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-5.2.x by this push:
     new 7c66f77  Oops. Did not mean to switch to LDAP as default.
7c66f77 is described below

commit 7c66f7766e3e17f5e408dd7441cc2385940d36f4
Author: snoopdave@gmail.com <snoopdave@gmail.com>
AuthorDate: Sun May 12 09:22:28 2019 -0400

    Oops. Did not mean to switch to LDAP as default.
---
 app/src/main/webapp/WEB-INF/security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/webapp/WEB-INF/security.xml b/app/src/main/webapp/WEB-INF/security.xml
index 33f80a2..b866f13 100644
--- a/app/src/main/webapp/WEB-INF/security.xml
+++ b/app/src/main/webapp/WEB-INF/security.xml
@@ -66,9 +66,9 @@
 
         <!-- Uncomment one of the three below, based on whether database, LDAP, or
              OpenID authentication is desired. -->
-        <authentication-provider ref="ldapAuthProvider" />
-        <!--
         <authentication-provider user-service-ref="rollerUserService"/>
+        <!--
+        <authentication-provider ref="ldapAuthProvider" />
         <authentication-provider ref="openIDAuthProvider"/>
         -->
     </authentication-manager>


Mime
View raw message