From fc49c10a5dd1245896ad4a8d79803f2b5a7d4bd8 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Tue, 26 Sep 2017 08:04:32 +0000
Subject: [PATCH] Remove old hook (fixes: #1306)

---
 Makefile                                            | 8 ++++----
 lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9205002b7..547ca3bea 100644
--- a/Makefile
+++ b/Makefile
@@ -115,9 +115,9 @@ TESTWEBSERVER=apache
 TESTWEBSERVERPORT=19876
 
 # LDAP backend test
-LLNGTESTLDAP_SLAPD_BIN:=/usr/sbin/slapd
-LLNGTESTLDAP_SLAPADD_BIN:=/usr/sbin/slapdadd
-LLNGTESTLDAP_SCHEMA_DIR:=/etc/slapd/schema
+LLNGTESTLDAP_SLAPD_BIN=/usr/sbin/slapd
+LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapdadd
+LLNGTESTLDAP_SCHEMA_DIR=/etc/slapd/schema
 
 # Other
 SRCCOMMONDIR=lemonldap-ng-common
@@ -430,7 +430,7 @@ start_web_server:	all prepare_test_server
 				addKey globalStorageOptions DataSource 'dbi:SQLite:dbname='`pwd`'/e2e-tests/conf/sessions.db'; \
 	fi
 	@# Debian: make start_web_server TESTBACKEND=LDAP LLNGTESTLDAP_SCHEMA_DIR=/etc/ldap/schema LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapadd
-	@if test "$(TESTBACKEND)" = "LDAP"; then \
+	if test "$(TESTBACKEND)" = "LDAP"; then \
 		cp lemonldap-ng-portal/t/testslapd/slapd.ldif e2e-tests/conf/; \
 		mkdir e2e-tests/conf/slapd.d; \
 		mkdir e2e-tests/conf/data; \
diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
index 09834475f..21def3d5f 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
@@ -245,12 +245,6 @@ sub setDefault {
         delete $conf->{useXForwardedForIP};
     }
 
-    # Force Choice backend
-    if ( $conf->{authentication} eq "Choice" ) {
-        $conf->{userDB}     = "Choice";
-        $conf->{passwordDB} = "Choice";
-    }
-
     # Some parameters expect key name (example), not variable ($example)
     if ( defined $conf->{whatToTrace} ) {
         $conf->{whatToTrace} =~ s/^\$//;