michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unknown param is sometimes reported on stderr

Browse Source
This commit is contained in:
Jamie Cameron
2020-06-08 20:34:49 -07:00
parent 3887aedf50
commit 965561793d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
postfix/images/sni.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

8
postfix/postfix-lib.pl
View File

@@ -128,12 +128,14 @@ foreach my $l (@$lref) {
if (!defined($out) && !$_[1]) {
# Fall back to asking Postfix
# -h tells postconf not to output the name of the parameter
$out = &backquote_command("$config{'postfix_config_command'} -c $config_dir -h ".
quotemeta($name)." 2>/dev/null", 1);
my $err;
&execute_command("$config{'postfix_config_command'} -c $config_dir -h ".
quotemeta($name), undef, \$out, \$err, 0, 1);
if ($?) {
&error(&text('query_get_efailed', $name, $out));
}
elsif ($out =~ /warning:.*unknown\s+parameter/) {
elsif ($out =~ /warning:.*unknown\s+parameter/ ||
$err =~ /warning:.*unknown\s+parameter/) {
return undef;
}
chop($out);