michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Always save some global options

Browse Source
This commit is contained in:
Jamie Cameron
2011-05-05 21:37:33 -07:00
parent 521b0baf92
commit db523bec94
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
postfix/postfix-lib.pl
View File

@@ -171,8 +171,8 @@ sub get_default_value
sub set_current_value
{
my $value = $_[1];
# print "--".$value."--<br>";
if (($value eq "__DEFAULT_VALUE_IE_NOT_IN_CONFIG_FILE__" || $value eq &get_default_value($_[0])) && !$_[2])
if ($value eq "__DEFAULT_VALUE_IE_NOT_IN_CONFIG_FILE__" ||
$value eq &get_default_value($_[0]) && !$_[2])
{
# there is a special case in which there is no static default value ;
# postfix will handle it correctly if I remove the line in `main.cf'
@@ -204,10 +204,13 @@ sub set_current_value
}
else
{
$value =~ s/\$/\\\$/g; # prepend a \ in front of every $ to protect from shell substitution
local ($out, $ex);
$ex = &execute_command("$config{'postfix_config_command'} -c $config_dir -e $_[0]=\"$value\"", undef, \$out, \$out);
$ex && &error(&text('query_set_efailed', $_[0], $_[1], $out)."<br> $config{'postfix_config_command'} -c $config_dir -e $_[0]=\"$value\" 2>&1");
$ex = &execute_command(
"$config{'postfix_config_command'} -c $config_dir ".
"-e $_[0]=".quotemeta($value), undef, \$out, \$out);
$ex && &error(&text('query_set_efailed', $_[0], $_[1], $out).
"<br> $config{'postfix_config_command'} -c $config_dir ".
"-e $_[0]=\"$value\" 2>&1");
&unflush_file_lines($config{'postfix_config_file'}); # Invalidate cache
}
}
@@ -538,7 +541,7 @@ foreach $e (@{$_[0]}) {
}
}
# save_options(%options)
# save_options(%options, [&always-save])
#
sub save_options
{
@@ -560,7 +563,8 @@ sub save_options
}
}
}
&set_current_value($param, $value);
&set_current_value($param, $value,
&indexof($param, @{$_[1]}) >= 0);
}
}
}

2
postfix/save_opts_misc.cgi
View File

@@ -19,7 +19,7 @@ require './postfix-lib.pl';
&lock_postfix_files();
&before_save();
&save_options(\%in);
&save_options(\%in, [ "myhostname", "mydomain" ]);
&ensure_map("relocated_maps");
&after_save();
&unlock_postfix_files();