Skip to content

Commit

Permalink
LISTNAME-request@DOMAIN aliases are not supported (#1922)
Browse files Browse the repository at this point in the history
  • Loading branch information
ikedas committed Jan 23, 2025
1 parent afbc496 commit cf90aca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
5 changes: 2 additions & 3 deletions src/lib/Sympa/Aliases/CheckSMTP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@ sub check {
|| $smtp_relay;
$smtp_helo =~ s/:[-\w]+$// if $smtp_helo;

my @suffixes = split /\s*,\s*/,
(Conf::get_robot_conf($robot_id, 'list_check_suffixes') || '');
my @addresses = (
sprintf('%s@%s', $name, $robot_id),
map { sprintf('%s-%s@%s', $name, $_, $robot_id) } @suffixes
map { sprintf('%s-%s@%s', $name, $_, $robot_id) }
@{Conf::get_robot_conf($robot_id, 'list_check_suffixes') // []}
);
my $return_address = sprintf '%s%s@%s', $name,
(Conf::get_robot_conf($robot_id, 'return_path_suffix') || ''),
Expand Down
5 changes: 2 additions & 3 deletions src/lib/Sympa/List/Users.pm
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,8 @@ use constant _local_validations => {
push @special, map {
sprintf '%s-%s@%s',
$list->{'name'}, lc $_, $list->{'domain'}
}
split /[,\s]+/,
Conf::get_robot_conf($list->{'domain'}, 'list_check_suffixes');
} @{Conf::get_robot_conf($list->{'domain'}, 'list_check_suffixes')
// []};
my $bounce_email_re = quotemeta($list->get_bounce_address('ANY'));
$bounce_email_re =~ s/(?<=\\\+).*(?=\\\@)/.*/;

Expand Down
9 changes: 2 additions & 7 deletions src/lib/Sympa/Spool.pm
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,9 @@ sub split_listname {

my $return_path_suffix =
Conf::get_robot_conf($robot_id, 'return_path_suffix');
my $regexp = join(
'|',
my $regexp = join '|',
map { quotemeta $_ }
grep { $_ and length $_ }
split(
/[\s,]+/, Conf::get_robot_conf($robot_id, 'list_check_suffixes')
)
);
@{Conf::get_robot_conf($robot_id, 'list_check_suffixes') // []};

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

0 comments on commit cf90aca

Please sign in to comment.