mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 06:03:28 +00:00
Use formal params
This commit is contained in:
3
filemin/safeacl
Normal file
3
filemin/safeacl
Normal file
@@ -0,0 +1,3 @@
|
||||
allowed_paths=$HOME
|
||||
work_as_root=0
|
||||
work_as_user=0
|
||||
6
passwd/safeacl
Normal file
6
passwd/safeacl
Normal file
@@ -0,0 +1,6 @@
|
||||
mode=3
|
||||
self=1
|
||||
repeat=1
|
||||
expire=0
|
||||
others=1
|
||||
old=1
|
||||
@@ -3938,10 +3938,12 @@ sub get_module_acl
|
||||
{
|
||||
my $u = defined($_[0]) ? $_[0] : $base_remote_user;
|
||||
my $m = defined($_[1]) ? $_[1] : &get_module_name();
|
||||
my $norbac = $_[2];
|
||||
my $nodef = $_[3];
|
||||
$m ||= "";
|
||||
my $mdir = &module_root_directory($m);
|
||||
my %rv;
|
||||
if (!$_[3]) {
|
||||
if (!$nodef) {
|
||||
# Read default ACL first, to be overridden by per-user settings
|
||||
&read_file_cached("$mdir/defaultacl", \%rv);
|
||||
|
||||
@@ -3954,7 +3956,7 @@ if (!$_[3]) {
|
||||
}
|
||||
}
|
||||
my %usersacl;
|
||||
if (!$_[2] && &supports_rbac($m) && &use_rbac_module_acl($u, $m)) {
|
||||
if (!$norbac && &supports_rbac($m) && &use_rbac_module_acl($u, $m)) {
|
||||
# RBAC overrides exist for this user in this module
|
||||
my $rbac = &get_rbac_module_acl(
|
||||
defined($_[0]) ? $_[0] : $remote_user, $m);
|
||||
|
||||
Reference in New Issue
Block a user