Skip to content

Commit e97a5ce

Browse files
authored
Merge pull request #1929 from ikedas/issue-1922 by ikedas
LISTNAME-request@DOMAIN aliases are not supported (#1922)
2 parents cf6f10d + cf90aca commit e97a5ce

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

src/lib/Sympa/Aliases/CheckSMTP.pm

+2-3
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ sub check {
4848
|| $smtp_relay;
4949
$smtp_helo =~ s/:[-\w]+$// if $smtp_helo;
5050

51-
my @suffixes = split /\s*,\s*/,
52-
(Conf::get_robot_conf($robot_id, 'list_check_suffixes') || '');
5351
my @addresses = (
5452
sprintf('%s@%s', $name, $robot_id),
55-
map { sprintf('%s-%s@%s', $name, $_, $robot_id) } @suffixes
53+
map { sprintf('%s-%s@%s', $name, $_, $robot_id) }
54+
@{Conf::get_robot_conf($robot_id, 'list_check_suffixes') // []}
5655
);
5756
my $return_address = sprintf '%s%s@%s', $name,
5857
(Conf::get_robot_conf($robot_id, 'return_path_suffix') || ''),

src/lib/Sympa/List/Users.pm

+2-3
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@ use constant _local_validations => {
198198
push @special, map {
199199
sprintf '%s-%s@%s',
200200
$list->{'name'}, lc $_, $list->{'domain'}
201-
}
202-
split /[,\s]+/,
203-
Conf::get_robot_conf($list->{'domain'}, 'list_check_suffixes');
201+
} @{Conf::get_robot_conf($list->{'domain'}, 'list_check_suffixes')
202+
// []};
204203
my $bounce_email_re = quotemeta($list->get_bounce_address('ANY'));
205204
$bounce_email_re =~ s/(?<=\\\+).*(?=\\\@)/.*/;
206205

src/lib/Sympa/Spool.pm

+2-7
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,9 @@ sub split_listname {
332332

333333
my $return_path_suffix =
334334
Conf::get_robot_conf($robot_id, 'return_path_suffix');
335-
my $regexp = join(
336-
'|',
335+
my $regexp = join '|',
337336
map { quotemeta $_ }
338-
grep { $_ and length $_ }
339-
split(
340-
/[\s,]+/, Conf::get_robot_conf($robot_id, 'list_check_suffixes')
341-
)
342-
);
337+
@{Conf::get_robot_conf($robot_id, 'list_check_suffixes') // []};
343338

344339
if ( $mailbox eq 'sympa'
345340
and $robot_id eq $Conf::Conf{'domain'}) { # compat.

0 commit comments

Comments
 (0)