dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old hook (fixes: #1306)

This commit is contained in:
Xavier Guimard 2017-09-26 08:04:32 +00:00
parent 8c23530293
commit fc49c10a5d
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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; \

6
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View File

@ -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/^\$//;