Compare commits

..

3 Commits
1.993 ... 1.994

Author SHA1 Message Date
Jamie Cameron
9477ea298d Merge pull request #1641 from webmin/dev/fix-admin-check
Fix admin check
2022-05-23 13:26:54 -07:00
Jamie Cameron
c4a5148f2b New version bump 2022-05-23 13:23:00 -07:00
Ilia
3f3b5bdf9c Fix admin check 2022-05-23 22:02:48 +03:00
3 changed files with 4 additions and 4 deletions

View File

@@ -29,7 +29,7 @@ Webmin can be installed in two different ways:
1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) from our [download page](http://webmin.com/download.html);
<kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.993.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.994.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
<kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
## Documentation

View File

@@ -1 +1 @@
1.993
1.994

View File

@@ -12125,8 +12125,8 @@ sub webmin_user_is_admin
my ($user) = @_;
$user ||= $base_remote_user;
my %access = &get_module_acl($user, "");
return 1 if ($access{'rpc'} == 0); # Can make arbitary RPC calls
return 0 if ($access{'rpc'} == 1); # Cannot make RPCs
return 1 if ($access{'rpc'} == 1); # Can make arbitary RPC calls
return 0 if ($access{'rpc'} == 0); # Cannot make RPCs
# Assume that standard admin usernames are root-capable as a fallback
return $user eq 'admin' || $user eq 'root' || $user eq 'sysadm';