Commit 85e388d3 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Fixup for #440.

parent 2afe0d4c
......@@ -10937,7 +10937,7 @@ sub _do_edit_list_request {
$pitem->{format} = $list_of_scenario;
} elsif ($pitem->{task}) {
my $tasks = Sympa::Task::get_tasks($list, $pitem->{task});
$pitem->{format} = { map { ($_->{name} => $_) } @$tasks };
$pitem->{format} = {map { ($_->{name} => $_) } @$tasks};
} elsif ($pitem->{datasource}) {
my $list_of_data_sources = $list->load_data_sources_list($robot);
$pitem->{format} = $list_of_data_sources;
......
......@@ -1007,14 +1007,14 @@ sub _load_auth {
'use_tls' => 'starttls|ldaps|none',
'use_ssl' => '1', # Obsoleted
'use_start_tls' => '1', # Obsoleted
'ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_[123]',
'ssl_ciphers' => '[\w:]+',
'ssl_cert' => '.+',
'ssl_key' => '.+',
'ca_verify' => '\w+',
'ca_path' => '.+',
'ca_file' => '.+',
'force_email_verify' => '1',
'ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_[123]',
'ssl_ciphers' => '[\w:]+',
'ssl_cert' => '.+',
'ssl_key' => '.+',
'ca_verify' => '\w+',
'ca_path' => '.+',
'ca_file' => '.+',
'force_email_verify' => '1',
'internal_email_by_netid' => '1',
'netid_http_header' => '[\w\-\.]+',
},
......
......@@ -117,14 +117,14 @@ our @params = (
'file' => 'sympa.conf',
'edit' => '1',
},
{ 'name' => 'db_host',
{ 'name' => 'db_host',
#'default' => 'localhost',
'sample' => 'localhost',
'gettext_id' => 'Hostname of the database server',
'gettext_comment' =>
'With PostgreSQL, you can also use the path to Unix Socket Directory, e.g. "/var/run/postgresql" for connection with Unix domain socket.',
'file' => 'sympa.conf',
'edit' => '1',
'file' => 'sympa.conf',
'edit' => '1',
'optional' => 1,
},
{ 'name' => 'db_port',
......
......@@ -1263,7 +1263,10 @@ our %pinfo = (
'ssl_version' => {
'order' => 2.6,
'gettext_id' => 'SSL version',
'format' => ['sslv2', 'sslv3', 'tlsv1', 'tlsv1_1', 'tlsv1_2', 'tlsv1_3'],
'format' => [
'sslv2', 'sslv3', 'tlsv1', 'tlsv1_1',
'tlsv1_2', 'tlsv1_3'
],
'synonym' => {'tls' => 'tlsv1'},
'occurrence' => '1',
'default' => 'tlsv1'
......@@ -1389,7 +1392,10 @@ our %pinfo = (
'ssl_version' => {
'order' => 2.6,
'gettext_id' => 'SSL version',
'format' => ['sslv2', 'sslv3', 'tlsv1', 'tlsv1_1', 'tlsv1_2', 'tlsv1_3'],
'format' => [
'sslv2', 'sslv3', 'tlsv1', 'tlsv1_1',
'tlsv1_2', 'tlsv1_3'
],
'synonym' => {'tls' => 'tlsv1'},
'occurrence' => '1',
'default' => 'tlsv1'
......@@ -1705,7 +1711,10 @@ our %pinfo = (
'ssl_version' => {
'order' => 2.6,
'gettext_id' => 'SSL version',
'format' => ['sslv2', 'sslv3', 'tlsv1', 'tlsv1_1', 'tlsv1_2', 'tlsv1_3'],
'format' => [
'sslv2', 'sslv3', 'tlsv1', 'tlsv1_1',
'tlsv1_2', 'tlsv1_3'
],
'synonym' => {'tls' => 'tlsv1'},
'occurrence' => '1',
'default' => 'tlsv1'
......@@ -1835,7 +1844,10 @@ our %pinfo = (
'ssl_version' => {
'order' => 2.6,
'gettext_id' => 'SSL version',
'format' => ['sslv2', 'sslv3', 'tlsv1', 'tlsv1_1', 'tlsv1_2', 'tlsv1_3'],
'format' => [
'sslv2', 'sslv3', 'tlsv1', 'tlsv1_1',
'tlsv1_2', 'tlsv1_3'
],
'synonym' => {'tls' => 'tlsv1'},
'occurrence' => '1',
'default' => 'tlsv1'
......
......@@ -1305,9 +1305,10 @@ sub _anabounce {
} elsif (/^\s*(\S+)\n+\s*(.*)$/m) {
my ($exim_user, $exim_msg) = ($1, $2);
if ($exim_msg =~ /MTP error.*: \d\d\d (\d\.\d\.\d) \w/i) {
$info{$exim_user}{error} = $1;
$info{$exim_user}{error} = $1;
} elsif ($exim_msg =~ /MTP error.*: (\d)\d\d \w/i) {
$info{$exim_user}{error} = ($1 eq "5")?"5.1.1":"4.2.2";
$info{$exim_user}{error} =
($1 eq "5") ? "5.1.1" : "4.2.2";
}
$type = 24;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment