From be083d33e3698a0080f175e1885f14176b5fb009 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Sat, 5 Oct 2013 15:59:18 +0000
Subject: [PATCH] auth module may contains parameters

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBDemo.pm   | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBGoogle.pm | 5 ++---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBOpenID.pm | 5 ++---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm   | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBDemo.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBDemo.pm
index 9f09d92eb..c3e82d750 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBDemo.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBDemo.pm
@@ -16,7 +16,7 @@ our $VERSION = '1.3.0';
 sub userDBInit {
     my $self = shift;
 
-    if ( $self->get_module('auth') eq 'Demo' ) {
+    if ( $self->get_module('auth') =~ /^Demo/ ) {
 
         # Call authInit if demo accounts not found
         $self->authInit() unless defined $self->{_demoAccounts};
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBGoogle.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBGoogle.pm
index 1efae949c..4b0c52200 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBGoogle.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBGoogle.pm
@@ -17,15 +17,14 @@ our $VERSION = '1.3.0';
 sub userDBInit {
     my $self = shift;
 
-    if ( $self->get_module('auth') eq 'Google' ) {
-    }
-    else {
+    unless ( $self->get_module('auth') =~ /^Google/ ) {
         $self->lmLog(
 'UserDBGoogle isn\'t useable unless authentication module is set to Google',
             'error'
         );
         return PE_ERROR;
     }
+    PE_OK;
 }
 
 ## @apmethod int getUser()
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBOpenID.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBOpenID.pm
index 479741e4a..617e92270 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBOpenID.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBOpenID.pm
@@ -17,15 +17,14 @@ our $VERSION = '1.0.0';
 sub userDBInit {
     my $self = shift;
 
-    if ( $self->get_module('auth') eq 'OpenID' ) {
-    }
-    else {
+    unless ( $self->get_module('auth') =~ /^OpenID/ ) {
         $self->lmLog(
 'UserDBOpenID isn\'t useable unless authentication module is set to OpenID',
             'error'
         );
         return PE_ERROR;
     }
+    PE_OK;
 }
 
 ## @apmethod int getUser()
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
index 410f80f5b..e861a5a52 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
@@ -18,7 +18,7 @@ our $VERSION = '1.0.0';
 # @return Lemonldap::NG::Portal error code
 sub userDBInit {
     my $self = shift;
-    if ( $self->get_module('auth') eq 'SAML' ) {
+    if ( $self->get_module('auth') =~ /^SAML/ ) {
         return PE_OK;
     }
     else {