From 674324808f2bb1422e57d3f80633d63eeccff808 Mon Sep 17 00:00:00 2001
From: IKEDA Soji <ikeda@conversion.co.jp>
Date: Thu, 3 Jan 2019 18:23:03 +0900
Subject: [PATCH 1/2] [-bug] A scalar parameter in list config without value
 and separator is warned. See GH issue #468, Additional information.

---
 src/lib/Sympa/List.pm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
index 3e1d4d78f..c0102ecf7 100644
--- a/src/lib/Sympa/List.pm
+++ b/src/lib/Sympa/List.pm
@@ -6392,7 +6392,7 @@ sub _load_include_admin_user_file {
                 }
 
                 unless ($paragraph[$i] =~
-                    /^\s*$key\s+($pinfo->{$pname}{'file_format'}{$key}{'file_format'})\s*$/i
+                    /^\s*$key(?:\s+($pinfo->{$pname}{'file_format'}{$key}{'file_format'}))?\s*$/i
                 ) {
                     chomp($paragraph[$i]);
                     $log->syslog('info',
@@ -6415,7 +6415,8 @@ sub _load_include_admin_user_file {
                     if (defined $pinfo->{$pname}{'file_format'}{$k}{'default'}
                     ) {
                         $hash{$k} =
-                            $self->_load_list_param($k, 'default',
+                            $self->_load_list_param($k,
+                            $pinfo->{$pname}{'file_format'}{$k}{'default'},
                             $pinfo->{$pname}{'file_format'}{$k});
                     }
                 }
@@ -6448,7 +6449,7 @@ sub _load_include_admin_user_file {
             }
 
             unless ($paragraph[0] =~
-                /^\s*$pname\s+($pinfo->{$pname}{'file_format'})\s*$/i) {
+                /^\s*$pname(?:\s+($pinfo->{$pname}{'file_format'}))?\s*$/i) {
                 chomp($paragraph[0]);
                 $log->syslog('info', 'Bad entry "%s" in %s',
                     $paragraph[0], $file);
@@ -8144,14 +8145,9 @@ sub _load_list_param {
     my $robot     = $self->{'domain'};
     my $directory = $self->{'dir'};
 
-    ## Empty value
-    if ($value =~ /^\s*$/) {
-        return undef;
-    }
-
-    ## Default
-    if ($value eq 'default') {
-        $value = $p->{'default'};
+    # Empty value.
+    unless (defined $value and $value =~ /\S/) {
+        return undef;   #FIXME
     }
 
     ## Search configuration file
@@ -8400,7 +8396,7 @@ sub _load_list_config_file {
                 }
 
                 unless ($paragraph[$i] =~
-                    /^\s*$key\s+($pinfo->{$pname}{'file_format'}{$key}{'file_format'})\s*$/i
+                    /^\s*$key(?:\s+($pinfo->{$pname}{'file_format'}{$key}{'file_format'}))?\s*$/i
                 ) {
                     chomp($paragraph[$i]);
                     $log->syslog(
@@ -8464,7 +8460,7 @@ sub _load_list_config_file {
             }
 
             unless ($paragraph[0] =~
-                /^\s*$pname\s+($pinfo->{$pname}{'file_format'})\s*$/i) {
+                /^\s*$pname(?:\s+($pinfo->{$pname}{'file_format'}))?\s*$/i) {
                 chomp($paragraph[0]);
                 $log->syslog('info', 'Bad entry "%s" in %s',
                     $paragraph[0], $config_file);

From 898f69bc95f5e662d2d0354d807604e98efee1da Mon Sep 17 00:00:00 2001
From: IKEDA Soji <ikeda@conversion.co.jp>
Date: Mon, 14 Jan 2019 10:06:30 +0900
Subject: [PATCH 2/2] More fix.

---
 src/lib/Sympa/List.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
index c0102ecf7..71a6fce39 100644
--- a/src/lib/Sympa/List.pm
+++ b/src/lib/Sympa/List.pm
@@ -8424,7 +8424,8 @@ sub _load_list_config_file {
                     if (defined $pinfo->{$pname}{'file_format'}{$k}{'default'}
                     ) {
                         $hash{$k} =
-                            $self->_load_list_param($k, 'default',
+                            $self->_load_list_param($k,
+                            $pinfo->{$pname}{'file_format'}{$k}{'default'},
                             $pinfo->{$pname}{'file_format'}{$k});
                     }
                 }