From 61deddcd6efde1a88bf69d9739492c2abf33c1b4 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 29 Jul 2014 12:32:57 +0200 Subject: [PATCH] Adapt basic auth for SME9 --- root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist index aaa02e3..63b1924 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist @@ -4,6 +4,7 @@ my $status = $phplist{'status'} || 'disabled'; my $access = $phplist{'access'} || 'private'; my $auth = $phplist{'Authentication'} || 'http'; my $alias = $phplist{'AliasOnPrimary'} || 'enabled'; +my $ver = $sysconfig{'ReleaseVersion'} || '8.1'; my @users = split(/[;,]/, ($phplist{'AdminUsers'} || 'admin')); my $users = join(' ', @users); @@ -11,7 +12,7 @@ my $allow = ( $access eq 'public' ) ? 'all' : "$localAccess $externalSSLAccess"; $alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/'; $auth = ( $auth eq 'http' ) ? 'AuthName "phplist"' . "\n" . " AuthType Basic\n" . - " AuthExternal pwauth\n" . + " AuthExternal pwauth\n" . (($ver =~ m/^9/) ? " AuthBasicProvider external\n":'') . " require user $users\n" : ''; if ($status eq 'enabled') {