diff --git a/Makefile b/Makefile index aab5ae35e..21647c9a9 100644 --- a/Makefile +++ b/Makefile @@ -446,7 +446,8 @@ start_web_server: all prepare_test_server @if test "$(TESTBACKEND)" = "DBI"; then \ echo 'create table lmConfig (cfgNum int, data text);'|sqlite3 e2e-tests/conf/config.db; \ echo 'create table sessions (id text, a_session text, LastUpdated int);'|sqlite3 e2e-tests/conf/sessions.db; \ - perl --current=e2e-tests/conf/lemonldap-ng.ini \ + perl lemonldap-ng-common/scripts/convertConfig \ + --current=e2e-tests/conf/lemonldap-ng.ini \ --new=e2e-tests/conf/lemonldap-ng-sql.ini; \ mv e2e-tests/conf/lemonldap-ng-sql.ini e2e-tests/conf/lemonldap-ng.ini; \ LLNG_DEFAULTCONFFILE=e2e-tests/conf/lemonldap-ng.ini \ diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notifications/DBI.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notifications/DBI.pm index 9c3fd1c77..2f30a4999 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notifications/DBI.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notifications/DBI.pm @@ -146,7 +146,9 @@ sub purge { $self->logger->warn("Bad reference $myref"); return 0; } - unless ( $d =~ s/^(\d{4})(\d{2})(\d{2}).*$/$1-$2-$3/ ) { + unless ( $d =~ s/^(\d{4})(\d{2})(\d{2}).*$/$1-$2-$3/ + or $d =~ s/^(\d{4}-\d{2}-\d{2}).*$/$1/ ) + { $self->logger->warn("Bad date $d"); return 0; }