Skip to content

Commit f652c59

Browse files
author
Till Brehm
committed
Fixed postconf warnings in installer.
1 parent 238326c commit f652c59

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

install/lib/installer_base.lib.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ public function configure_postfix($options = '') {
875875
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
876876
$configfile = $config_dir.'/master.cf';
877877
if ($this->postfix_master()) {
878-
exec ("postconf -M maildrop.unix", $out, $ret);
878+
exec ("postconf -M maildrop.unix &> /dev/null", $out, $ret);
879879
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
880880
} else { //* fallback - postfix < 2.9
881881
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
@@ -1055,7 +1055,7 @@ public function configure_dovecot() {
10551055
$config_dir = $conf['postfix']['config_dir'];
10561056
//* Configure master.cf and add a line for deliver
10571057
if ($this->postfix_master()) {
1058-
exec ("postconf -M dovecot.unix", $out, $ret);
1058+
exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
10591059
$add_dovecot_service = @($out[0]=='')?true:false;
10601060
} else { //* fallback - postfix < 2.9
10611061
$content = rf($config_dir.'/master.cf');
@@ -1197,13 +1197,13 @@ public function configure_amavis() {
11971197

11981198
// Adding amavis-services to the master.cf file if the service does not already exists
11991199
if ($this->postfix_master()) {
1200-
exec ("postconf -M amavis.unix", $out, $ret);
1200+
exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
12011201
$add_amavis = @($out[0]=='')?true:false;
12021202
unset($out);
1203-
exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
1203+
exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
12041204
$add_amavis_10025 = @($out[0]=='')?true:false;
12051205
unset($out);
1206-
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
1206+
exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
12071207
$add_amavis_10027 = @($out[0]=='')?true:false;
12081208
unset($out);
12091209
} else { //* fallback - postfix < 2.9

0 commit comments

Comments
 (0)