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

Don't try root-only stuff if we aren't root

Browse Source
This commit is contained in:
Jamie Cameron
2008-12-31 00:09:57 +00:00
parent d0b3a49dbe
commit 71b1ad6d49
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
filter/filter-lib.pl
View File

@@ -10,28 +10,35 @@ do 'autoreply-file-lib.pl';
if (&get_product_name() eq 'usermin') {
# If configured, check if this user has virtualmin spam filtering
# enabled before switching away from root
if ($config{'virtualmin_spam'} && -x $config{'virtualmin_spam'} &&
$< == 0) {
local $out = `$config{'virtualmin_spam'} $remote_user </dev/null 2>/dev/null`;
$out =~ s/\r|\n//g;
if ($out =~ /\d/) {
# Yes - we can show the user this
$global_spamassassin = 2;
$virtualmin_domain_id = $out;
}
}
# Copy autoreply.pl to /etc/usermin/forward, while we are still root
local $autoreply_src = "$root_directory/forward/autoreply.pl";
$autoreply_cmd = "$config_directory/forward/autoreply.pl";
local @rst = stat($autoreply_src);
local @cst = stat($autoreply_cmd);
if (!@cst || $cst[7] != $rst[7]) {
&copy_source_dest($autoreply_src, $autoreply_cmd);
&set_ownership_permissions(undef, undef, 0755, $autoreply_cmd);
if ($< == 0) {
if ($config{'virtualmin_spam'} &&
-x $config{'virtualmin_spam'}) {
local $out = &backquote_command(
"$config{'virtualmin_spam'} $remote_user ".
"</dev/null 2>/dev/null");
$out =~ s/\r|\n//g;
if ($out =~ /\d/) {
# Yes - we can show the user this
$global_spamassassin = 2;
$virtualmin_domain_id = $out;
}
}
# Copy autoreply.pl to /etc/usermin/forward, while we
# are still root
local $autoreply_src = "$root_directory/forward/autoreply.pl";
local @rst = stat($autoreply_src);
local @cst = stat($autoreply_cmd);
if (!@cst || $cst[7] != $rst[7]) {
&copy_source_dest($autoreply_src, $autoreply_cmd);
&set_ownership_permissions(
undef, undef, 0755, $autoreply_cmd);
}
&switch_to_remote_user();
}
&switch_to_remote_user();
&create_user_config_dirs();
&foreign_require("procmail", "procmail-lib.pl");
&foreign_require("mailbox", "mailbox-lib.pl");