New major version bump

https://forum.virtualmin.com/t/virtualmin-fail2ban-firewalld-ubuntu-20-04-not-working-already-banned-until-restart/116565/4?u=ilia

README.md

@@ -31,7 +31,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)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or 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.999.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-2.000.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_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
 
 ## Documentation

bin/webmin

@@ -69,7 +69,7 @@ sub main {
                     read_file($mod, \%mod_info);
                     my $mod_ver = $mod_info{'version_actual'} || $mod_info{'version'};
                     my $mod_desc = $mod_info{'desc'};
-                    if ($mod_ver && $prod_ver && $mod_desc && $mod_ver ne $prod_ver) {
+                    if ($mod_ver && $prod_ver && $mod_desc && $prod_ver !~ /^$mod_ver/) {
                         say  CYAN, "  $module_type: ", RESET if (!$head++);
                         my ($mod_dir) = $mod =~ m/$prod_root\/(.*?)\//;
                         push(@minfo, {'desc' => $mod_desc, 'ver' => $mod_ver, 'dir' => $mod_dir});
@@ -105,13 +105,18 @@ sub main {
             my $ver1 = "$root/version";
             my $ver2 = "$opt{'config'}/version";
             my $ver = read_file_contents($ver1) || read_file_contents($ver2);
+            my $verrel_file = "$root/release";
+            my $verrel = -r $verrel_file ? read_file_contents($verrel_file) : "";
+            if ($verrel) {
+                $verrel = ":@{[trim($verrel)]}";
+            }
             $ver = trim($ver);
             if ($ver) {
                 if ($opt{'version'}) {
-                    say $ver;
+                    say "$ver$verrel";
                     exit 0;
                 } else {
-                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, $ver), DARK " [$root]", RESET;
+                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, "$ver$verrel"), DARK " [$root]", RESET;
                 }
             } else {
                 say RED, "Error: ", RESET, "Cannot determine Webmin version";
@@ -153,7 +158,12 @@ sub main {
                         my $uver1 = "$uroot/version";
                         my $uver2 = "$wmumconfig/version";
                         my $uver = read_file_contents($uver1) || read_file_contents($uver2);
-                        $uver = trim($uver);
+                        my $uverrel_file = "$uroot/release";
+                        my $uverrel      = -r $uverrel_file ? read_file_contents($uverrel_file) : "";
+                        if ($uverrel) {
+                            $uverrel = ":@{[trim($uverrel)]}";
+                        }
+                        $uver = trim($uver) . $uverrel;
                         if ($uver) {
                             say CYAN, "Usermin: ", RESET, &$ver_checked($versions_remote{'usermin'}, $uver), DARK " [$uroot]", RESET;
                             my ($udir, @uthemes, @umods);

bind8/config-AlmaLinux-6.0-ALL

@@ -51,6 +51,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-CentOS-Linux-6.0-7.0

@@ -42,7 +42,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +54,5 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+chroot=
+auto_chroot=

bind8/config-CentOS-Linux-8.0-ALL

@@ -47,6 +47,8 @@ tmpl_dnssec_dt=1
 force_random=0
 spf_record=0
 dnssec_info=1
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-CentOS-Stream-Linux-8.0-ALL

@@ -51,6 +51,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-Oracle-Linux-8.0-ALL

@@ -51,6 +51,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-Redhat-Enterprise-Linux-6.0-7.0

@@ -42,7 +42,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21

bind8/config-Redhat-Enterprise-Linux-8.0-ALL

@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +10,7 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -42,7 +40,15 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
 force_random=0
 spf_record=0
 dnssec_info=1
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-Rocky-Linux-6.0-ALL

@@ -51,6 +51,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
-restart_cmd=systemctl reload named.service
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-Scientific-Linux-6.0-ALL

@@ -43,7 +43,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 force_random=0
 spf_record=0
 dnssec_info=1

bind8/config-redhat-linux

@@ -1,44 +0,0 @@
-soa_style=1
-named_path=/usr/sbin/named
-named_conf=/etc/named.conf
-show_list=1
-records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
-max_zones=50
-rev_def=0
-support_aaaa=1
-allow_comments=0
-allow_wild=1
-allow_long=0
-master_ttl=1
-whois_cmd=whois
-short_names=0
-updserial_def=0
-updserial_on=1
-updserial_man=1
-ndc_cmd=ndc
-forwardzonefilename_format=ZONE.hosts
-reversezonefilename_format=ZONE.rev
-rev_must=0
-ipv6_mode=1
-allow_underscore=1
-by_view=0
-confirm_zone=1
-confirm_rec=0
-no_chroot=0
-relative_paths=0
-rndc_cmd=rndc
-no_pid_chroot=0
-soa_start=0
-rndc_conf=/etc/rndc.conf
-rndcconf_cmd=rndc-confgen
-largezones=0
-checkzone=named-checkzone
-keygen=dnssec-keygen
-signzone=dnssec-signzone
-checkconf=named-checkconf
-other_slaves=1
-force_random=0
-spf_record=0
-dnssec_info=1

bind8/config-redhat-linux-7.0-ALL

@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +10,7 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -28,12 +26,10 @@ by_view=0
 confirm_zone=1
 confirm_rec=0
 no_chroot=0
-chroot=/var/named/chroot
 relative_paths=0
 rndc_cmd=rndc
 master_dir=/var/named
 slave_dir=/var/named/slaves
-auto_chroot=sh -c '. /etc/sysconfig/named && echo "$ROOTDIR"'
 no_pid_chroot=0
 soa_start=0
 rndc_conf=/etc/rndc.conf
@@ -44,6 +40,15 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
 force_random=0
 spf_record=0
 dnssec_info=1
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/config-redhat-linux-7.1-9.0

@@ -1,45 +0,0 @@
-soa_style=1
-named_path=/usr/sbin/named
-named_conf=/etc/named.conf
-show_list=1
-records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
-max_zones=50
-rev_def=0
-support_aaaa=1
-allow_comments=0
-allow_wild=1
-allow_long=0
-master_ttl=1
-pid_file=/var/run/named/named.pid
-whois_cmd=whois
-short_names=0
-updserial_def=0
-updserial_on=1
-updserial_man=1
-ndc_cmd=ndc
-forwardzonefilename_format=ZONE.hosts
-reversezonefilename_format=ZONE.rev
-rev_must=0
-ipv6_mode=1
-allow_underscore=1
-by_view=0
-confirm_zone=1
-confirm_rec=0
-no_chroot=0
-relative_paths=0
-rndc_cmd=rndc
-no_pid_chroot=0
-soa_start=0
-rndc_conf=/etc/rndc.conf
-rndcconf_cmd=rndc-confgen
-largezones=0
-checkzone=named-checkzone
-keygen=dnssec-keygen
-signzone=dnssec-signzone
-checkconf=named-checkconf
-other_slaves=1
-force_random=0
-spf_record=0
-dnssec_info=1

bind8/config-redhat-linux-ALL-6.0

@@ -3,8 +3,8 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
+start_cmd=service named start
+stop_cmd=service named stop
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +12,7 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named/named.pid
+pid_file=/var/run/named.pid /run/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -28,12 +28,10 @@ by_view=0
 confirm_zone=1
 confirm_rec=0
 no_chroot=0
-chroot=/var/named/chroot
 relative_paths=0
 rndc_cmd=rndc
 master_dir=/var/named
-slave_dir=/var/named
-auto_chroot=sh -c '. /etc/sysconfig/named ; echo "$ROOTDIR"'
+slave_dir=/var/named/slaves
 no_pid_chroot=0
 soa_start=0
 rndc_conf=/etc/rndc.conf
@@ -44,6 +42,17 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
+restart_cmd=service named restart
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
+dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
+dnssectools_rollrec=/var/named/system.rollrec
+dnssectools_keydir=/var/named/dtkeys
+dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+chroot=
+auto_chroot=

bind8/config-windows

@@ -35,7 +35,7 @@ largezones=0
 auto_chroot=
 pid_file=c:/windows/system32/dns/etc/named.pid
 default_prins=
-restart_cmd=restart
+restart_cmd=sc restart named
 file_perms=
 extra_reverse=
 default_master=

copyconfig.pl

@@ -113,30 +113,51 @@ foreach $m (@mods) {
 	}
 print join(" ", @newmods),"\n";
 
-# read_file(file, array)
-# Fill an associative array with name=value pairs from a file
+# read_file(file, &hash, [&order], [lowercase], [split-char])
+# Fill the given hash reference with name=value pairs from a file.
 sub read_file
 {
-local($arr);
-$arr = $_[1];
-open(ARFILE, "<".$_[0]) || return 0;
+my ($file, $hash, $order, $lowercase, $split) = @_;
+$split = "=" if (!defined($split));
+open(ARFILE, $file) || return 0;
+local $_;
 while(<ARFILE>) {
 	s/\r|\n//g;
-        if (!/^#/ && /^([^=]+)=(.*)$/) { $$arr{$1} = $2; }
+	my $cmt = index($_, "#");
+	my $eq = index($_, $split);
+	if ($cmt != 0 && $eq >= 0) {
+		my $n = substr($_, 0, $eq);
+		my $v = substr($_, $eq+1);
+		chomp($v);
+		$hash->{$lowercase ? lc($n) : $n} = $v;
+		push(@$order, $n) if ($order);
+        	}
         }
 close(ARFILE);
 return 1;
 }
- 
-# write_file(file, array)
-# Write out the contents of an associative array as name=value lines
+
+# write_file(file, &data-hash, [join-char])
+# Write out the contents of a hash as name=value lines.
 sub write_file
 {
-local($arr);
-$arr = $_[1];
-open(ARFILE, ">".$_[0]);
-foreach $k (keys %$arr) {
-        print ARFILE "$k=$$arr{$k}\n";
-        }
+my ($file, $data_hash, $join_char) = @_;
+my (%old, @order);
+my $join = defined($join_char) ? $join_char : "=";
+&read_file($file, \%old, \@order);
+open(ARFILE, ">$file") || die "open of $file failed : $!";
+my %done;
+foreach $k (@order) {
+	if (exists($data_hash->{$k}) && !$done{$k}++) {
+		(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+			die "write to $file failed : $!";
+		}
+	}
+foreach $k (keys %{$data_hash}) {
+	if (!exists($old{$k}) && !$done{$k}++) {
+		(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+			die "write to $file failed : $!";
+		}
+	}
 close(ARFILE);
 }

fail2ban/fail2ban-lib.pl

@@ -502,7 +502,14 @@ else {
 # Force the fail2ban server to re-read its config
 sub restart_fail2ban_server
 {
-my $out = &backquote_logged("$config{'client_cmd'} reload 2>&1 </dev/null");
+my ($force_restart) = @_;
+my $out;
+$out = &backquote_logged("$config{'client_cmd'} reload 2>&1 </dev/null")
+	if (!$force_restart);
+if ($? || $force_restart) {
+	&stop_fail2ban_server();
+	$out = &start_fail2ban_server();
+}
 return $? ? $out : undef;
 }
 

firewalld/firewalld-lib.pl

@@ -234,6 +234,7 @@ sub apply_firewalld
 {
 &foreign_require("init");
 my ($ok, $err) = &init::restart_action($config{'init_name'});
+&restart_firewalld_dependent();
 return $ok ? undef : $err;
 }
 
@@ -252,9 +253,24 @@ sub start_firewalld
 {
 &foreign_require("init");
 my ($ok, $err) = &init::start_action($config{'init_name'});
+&restart_firewalld_dependent();
 return $ok ? undef : $err;
 }
 
+# restart_firewalld_dependent()
+# Restarts dependent services
+sub restart_firewalld_dependent
+{
+if (&foreign_exists("fail2ban")) {
+	&foreign_require("fail2ban");
+	if (&fail2ban::is_fail2ban_running()) {
+		my $err = &fail2ban::restart_fail2ban_server(1);
+		&error(&text('index_dependent', 'fail2ban'))
+			if ($err);
+		}
+	}
+}
+
 # list_system_interfaces()
 # Returns the list of all interfaces on the system
 sub list_system_interfaces

firewalld/lang/en

@@ -37,6 +37,7 @@ index_listrules=List FirewallD Rules
 index_restart_firewalld=Reload FirewallD
 index_restart_firewallddesc=Reload the FirewallD server and apply the rules that were permanently created.
 index_listrules_restartdesc=List details about existing rich and direct FirewallD rules in $1 zone.
+index_dependent=Failed to restart $1 dependent service
 
 port_edit=Edit Port
 port_create=Add Port

init/atboot.pl

@@ -12,7 +12,7 @@ my $kill = &has_command("kill");
 
 if ($init_mode eq "osx") {
 	# Darwin System
-	&enable_at_boot("webmin", "Webmin administration server",
+	&enable_at_boot($product, "Webmin administration server",
 			"$config_directory/.start-init >/dev/null 2>&1 </dev/null",
 			"$config_directory/.stop-init");
 	}
@@ -132,7 +132,7 @@ elsif ($init_mode eq "systemd") {
 	         'opts'    => {
 	         'env'        => '"PERLLIB=' . $root_directory . '"',
 	         'stop'       => "$kill \$MAINPID",
-	         'reload'     => "$kill -USR1 \$MAINPID",
+	         'reload'     => "$kill -HUP \$MAINPID",
 	         'type'       => 'forking',
 	         'restart'    => 'always',
 	         'restartsec' => '2s',

lang/af.auto

@@ -46,7 +46,7 @@ config_nochange=Moenie verander nie
 config_setto=Stel na
 config_ewebmin=Parameter tipe 14 werk slegs in Webmin
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Maak seker dat u blaaier opgestel is om verwysingsinligting te stuur sodat dit deur Webmin geverifieer kan word.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/be.auto

@@ -125,7 +125,7 @@ help_eexec=$1 не атрымалася : $2
 referer_title=Папярэджанне аб бяспецы
 referer_warn=<b>Увага!</b> Webmin выявіў, што праграма $2 была звязана з URL $1, які, здаецца, знаходзіцца па-за Сервер Webmin. Гэта можа быць спроба падмануць ваш сервер у выкананні небяспечнай каманды.
 referer_warn_unknown=<b>Увага!</b> Webmin выявіў, што праграма $1 была звязана з невядомым URL, які, падобна, знаходзіцца па-за сервера Webmin. Гэта можа быць спроба падмануць ваш сервер у выкананні небяспечнай каманды.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Пераканайцеся ў тым, што ваш браўзэр настроены для адпраўкі інфармацыі аб рэферарыве, каб яго можна было праверыць Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/bg.auto

@@ -35,7 +35,7 @@ modules_clear=ясно
 config_emodule=Модул не съществува
 config_ewebmin=Тип параметър 14 работи само в Webmin
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Уверете се, че вашият браузър е конфигуриран да изпраща информация за реферала, така че да може да бъде проверен от Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/ca

@@ -122,7 +122,7 @@ help_eexec=$1 ha fallat: $2
 referer_title=Avís de Seguretat
 referer_warn=<b>Atenció!</b> Webmin ha detectat que el programa $2 és un enllaç a l'URL $1, que sembla ser que queda fora del servidor Webmin. Això pot ser un intent d'enganyar el servidor per tal que executi una ordre perillosa.
 referer_warn_unknown=<b>Atenció!</b> Webmin ha detectat que el programa $1 és un enllaç a un URL desconegut, que sembla ser que queda fora del servidor Webmin. Això pot ser un intent d'enganyar el servidor per tal que executi una ordre perillosa.
-referer_fix1=Si això és un enllaç legítim, pots permetre els enllaços des d'aquest URL tal i com segueix:<ul><li>Entra a Webmin normalment.<li>Ves al mòdul de <b>Configuració de Webmin</b>.<li>Fes clic a la icona de Referenciadors Fiables.<li>Introdueix el nom de host $1 al camp <b>Llocs Web fiables</b>, i fes clic a <b>Desa</b>.</ul>
+referer_fix1=Si això és un enllaç legítim, pots permetre els enllaços des d'aquest URL tal i com segueix:<ul><li>Entra a Webmin normalment.<li>Ves al mòdul de <b>Configuració de Webmin</b>.<li>Fes clic a la icona de Referenciadors Fiables.<li>Introdueix el nom de host $1 al camp <b>Llocs Web fiables</b>, i fes clic a <b>Desa.</b></ul>
 referer_fix2=Alternativament, pots configurar Webmin per que permeti aquest enllaç des de la línia d'ordres:<ul><li>Entra com a <tt>root</tt> i edita el fitxer <tt>/etc/webmin/config</tt>.<li>Afegeix-hi la línia <tt>referers=$1</tt> al final o, si ja existeix una línia <tt>referers</tt>, afegeix-hi <tt>$1</tt>.<li>Desa el fitxer.</ul>
 referer_fix3u=Assegura't que el teu navegador està configurat per enviar la informació del referenciador per tal que Webmin ho pugui verificar.
 referer_fix2u=Alternativament, pots configurar Webmin per permetre enllaços des de referenciadors desconeguts:<ul><li>Entra com a <tt>root</tt> i edita el fitxer <tt>/etc/webmin/config</tt>.<li>Busca la línia <tt>referers_none=1</tt> i canvia-la per <tt>referers_none=0</tt>.<li>Desa el fitxer.</ul><p>ATENCIÓ - això té l'efecte secundari d'obrir el sistema a atacs XSS reflectits i per tant no és recomanable!!

lang/el.auto

@@ -14,7 +14,7 @@ egroupdbacl2=Απέτυχε η ενημέρωση ομάδας ACL : $1
 
 config_emodule=Η ενότητα δεν υπάρχει
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Βεβαιωθείτε ότι το πρόγραμμα περιήγησης έχει ρυθμιστεί ώστε να στέλνει πληροφορίες παραπομπής, έτσι ώστε να μπορεί να επαληθευτεί από το Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/en

@@ -125,7 +125,7 @@ help_eexec=$1 failed : $2
 referer_title=Security Warning
 referer_warn=<b>Warning!</b> Webmin has detected that the program $2 was linked to from the URL $1, which appears to be outside the Webmin server. This may be an attempt to trick your server into executing a dangerous command.
 referer_warn_unknown=<b>Warning!</b> Webmin has detected that the program $1 was linked to from an unknown URL, which appears to be outside the Webmin server. This may be an attempt to trick your server into executing a dangerous command.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Make sure your browser is configured to send referrer information so that it can be verified by Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/fa.auto

@@ -32,7 +32,7 @@ modules_clear=پاک کردن
 
 config_emodule=ماژول وجود ندارد
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=اطمینان حاصل کنید که مرورگر شما برای ارسال اطلاعات ارجاع پیکربندی شده است تا بتواند توسط Webmin تأیید شود.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/fi.auto

@@ -14,7 +14,7 @@ egroupdbacl2=Ryhmän ACL: n päivitys epäonnistui : $1
 
 config_emodule=Moduulia ei ole
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Varmista, että selaimesi on määritetty lähettämään viitetiedot, jotta Webmin voi tarkistaa ne.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/fr.auto

@@ -21,7 +21,7 @@ chooser_eopen=Échec de l'inscription : $1
 
 config_emodule=Le module n'existe pas
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Assurez-vous que votre navigateur est configuré pour envoyer des informations de référence afin qu'elles puissent être vérifiées par Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/he.auto

@@ -58,7 +58,7 @@ config_setto=מכוון ל
 config_ewebmin=פרמטר מסוג 14 עובד רק ב- Webmin
 
 referer_warn_unknown=<b>Warning!</b> Webmin has detected that the program $1 was linked to from an unknown URL, which appears to be outside the Webmin server. This may be an attempt to trick your server into executing a dangerous command.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=ודא שהדפדפן שלך מוגדר לשליחת מידע מפנה כך שניתן לאמת אותו על ידי Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/hr.auto

@@ -125,7 +125,7 @@ help_eexec=$1 nije uspio : $2
 referer_title=Sigurnosno upozorenje
 referer_warn=<b>Upozorenje!</b> Webmin je otkrio da je program $2 povezan sa URL-om $1, za koji se čini da je izvan Webmin poslužitelj. Ovo može biti pokušaj prevare vašeg poslužitelja u izvršavanju opasne naredbe.
 referer_warn_unknown=<b>Upozorenje!</b> Webmin je otkrio da je program $1 povezan s nepoznatog URL-a, koji se čini izvan Webmin poslužitelja. Ovo može biti pokušaj prevare vašeg poslužitelja u izvršavanju opasne naredbe.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Provjerite je li vaš preglednik konfiguriran za slanje podataka preporuke tako da ih Webmin može provjeriti.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/hu.auto

@@ -19,7 +19,7 @@ config_emodule=A modul nem létezik
 config_ewebmin=A 14. paraméter csak a Webminben működik
 
 referer_warn_unknown=<b>Figyelem!</b> A Webmin észlelte, hogy a $1 programhoz egy ismeretlen URL-címről kapcsolódtak, amely úgy tűnik, hogy kívül esik a Webmin szerverén. Ez lehet egy kísérlet, hogy becsapja a szervert egy veszélyes parancs végrehajtására.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Győződjön meg arról, hogy a böngésző úgy van beállítva, hogy küldjön hivatkozási információkat, hogy azokat a Webmin ellenőrizze.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/it

@@ -125,7 +125,7 @@ help_eexec=$1 non riuscito : $2
 referer_title=Allarme di sicurezza
 referer_warn=<b>ATTENZIONE!</b> Webmin ha rilevato che il programma $2 è stato collegato all'URL $1, che sembra essere esterno al server Webmin. Questo potrebbe essere un tentativo di ingannare il tuo server nell'esecuzione di un comando pericoloso.
 referer_warn_unknown=<b>Attenzione!</b> Webmin ha rilevato che il programma $1 è stato collegato a un URL sconosciuto, che sembra essere esterno al server Webmin. Questo potrebbe essere un tentativo di ingannare il tuo server nell'esecuzione di un comando pericoloso.
-referer_fix1=Se questo è un link legittimo, puoi permettere i link da questo URL come segue :<ul><li>Entra in Webmin normalmente.</li><li>Vai al modulo <b>Configurazione di Webmin</b>.</li><li>Clicca sull'icona Referrer affidabili.</li><li>Inserisci il nome dell'host $1 nel campo <b>Siti web affidabili</b>, e clicca <b>Salva</b></li>.</ul>
+referer_fix1=Se questo è un link legittimo, puoi permettere i link da questo URL come segue :<ul><li>Entra in Webmin normalmente.</li><li>Vai al modulo <b>Configurazione di Webmin</b>.</li><li>Clicca sull'icona Referrer affidabili.</li><li>Inserisci il nome dell'host $1 nel campo <b>Siti web affidabili</b>, e clicca <b>Salva.</b></li></ul>
 referer_fix2=In alternativa, è possibile configurare Webmin per consentire questo collegamento dalla riga di comando :<ul><li>Accedi come <tt>root</tt>, e modifica il file <tt>/etc/webmin/config</tt>. </li><li>Aggiungi la linea <tt>referers=$1</tt> alla fine, o se una linea <tt>referers</tt> esiste già, aggiungi <tt>$1</tt> ad essa.</li><li>Salva il file.</li></ul>
 referer_fix3u=Assicurati che il tuo browser sia configurato per inviare informazioni sui referrer in modo che possano essere verificate da Webmin.
 referer_fix2u=In alternativa, puoi configurare Webmin per permettere i link da referer sconosciuti :<ul><li>Accedi come <tt>root</tt>, e modifica il file <tt>/etc/webmin/config</tt>. </li><li>Trova la linea <tt>referers_none=1</tt> e cambiala in <tt>referers_none=0</tt>.</li><li>Salva il file.</li></ul><p></p>AVVERTENZA - questo ha l'effetto collaterale di aprire il tuo sistema ad attacchi XSS riflessi e quindi non è consigliato!

lang/ja

@@ -123,7 +123,7 @@ help_eexec= $1は失敗しました : $2
 referer_title= セキュリティ警告
 referer_warn= <b>警告！</b> Webminは、プログラム$2がURL $1からリンクされていることを検出しました。これはWebminサーバの外にあるようです。これは、危険なコマンドを実行するためにサーバーを騙そうとする試みかもしれません。
 referer_warn_unknown= <b>警告！</ b> Webminは、プログラム$ 1が未知のURLからリンクされていることを検出しました。これはWebminサーバの外にあるようです。これは、危険なコマンドを実行するためにサーバーを騙そうとする試みかもしれません。
-referer_fix1= <li><b> Webmin設定</b>モジュールに移動します。 <b>信頼できるウェブサイト</b>フィールドにホスト名$ 1を入力し、[<b>保存</b>]をクリックします。</ul>
+referer_fix1= <li><b> Webmin設定</b>モジュールに移動します。 <b>信頼できるウェブサイト</b>フィールドにホスト名$ 1を入力し、[<b>保存。</b>]をクリックします</ul>
 referer_fix2= または、<tt> root </tt>としてログインし、<tt> /etc /webmin /config </tt>ファイルを編集してWebminがコマンドラインからこのリンクを許可するように設定できます。 <li>最後に<tt> referers=$1</tt>行を追加するか、<tt> referers </tt>行が既に存在する場合は、<tt> $ 1 </tt>ファイルを保存します。</ul>
 referer_fix3u= Webminで確認できるように参照情報を送信するようにブラウザが設定されていることを確認してください。
 referer_fix2u= <ul> <li> <tt> root </tt>としてログインし、<tt> /etc/webmin/config </tt>ファイルを編集することで、未知のリファラーからのリンクを許可するようにWebminを設定することができます。 li> <tt> referers_none = 1 </tt>行を探し、<tt> referers_none = 0 </tt>に変更してください。<li>ファイルを保存してください。</ul> <p>反射XSS攻撃までシステムを開く効果があるので、お勧めしません！

lang/lt.auto

@@ -44,7 +44,7 @@ modules_clear=Aišku
 config_emodule=Modulio nėra
 config_ewebmin=14 parametrų tipas veikia tik „Webmin“
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Įsitikinkite, kad jūsų naršyklė sukonfigūruota siuntimo informacijai siųsti, kad ją galėtų patikrinti „Webmin“.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/lv.auto

@@ -125,7 +125,7 @@ help_eexec=$1 neizdevās : $2
 referer_title=Drošības brīdinājums
 referer_warn=<b>Brīdinājums!</b> Webmin ir atklājis, ka programma $2 ir saistīta ar URL $1, kas, šķiet, atrodas ārpus Webmin serveris. Tas var būt mēģinājums pievilināt serveri bīstamas komandas izpildē.
 referer_warn_unknown=<b>Brīdinājums!</b> Webmin ir atklājis, ka programma $1 ir piesaistīta no nezināma URL, kas, šķiet, atrodas ārpus Webmin servera. Tas var būt mēģinājums pievilināt serveri bīstamas komandas izpildē.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Pārliecinieties, vai jūsu pārlūkprogramma ir konfigurēta, lai nosūtītu atsauces informāciju, lai Webmin to varētu pārbaudīt.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/ms

@@ -121,7 +121,7 @@ help_eexec=$1 gagal : $2
 referer_title=Amaran Keselamatan
 referer_warn=<b>Amaran!</b> Webmin telah mengesan program $2 yang telah dipautkan daripada URL $1, yang mana dipaparkan diluar pelayan Webmin. Ini mungkin cubaan untuk mengelirukan pelayan anda untuk melaksanakan arahan yang bahaya.
 referer_warn_unknown=<b>Amaram!</b> Webmin mengesan yang program $1 telah dipautkan kepada URL asing, dimana diluar pelayan Webmin. Ini mungkin cubaan untuk mengelirukan pelayan anda untuk melaksanakan arahan yang bahaya.
-referer_fix1=Jika ini adalah pautan yang sah, anda boleh benarkan pautan dari URL ini seperti berikut :<ul><li>Log masuk ke Webmin seperti biasa</li><li>Buka modul <b>Konfigurasi Webmin</b></li><li>Klik pada Perujuk ikon dipercayai.</li><li> Masukkan nama hos $1 ke dalam medan <b>laman web dipercayai</b>, dan klik <b>Simpan</b>.</li></ul>
+referer_fix1=Jika ini adalah pautan yang sah, anda boleh benarkan pautan dari URL ini seperti berikut :<ul><li>Log masuk ke Webmin seperti biasa</li><li>Buka modul <b>Konfigurasi Webmin</b></li><li>Klik pada Perujuk ikon dipercayai.</li><li> Masukkan nama hos $1 ke dalam medan <b>laman web dipercayai</b>, dan klik <b>Simpan.</b></li></ul>
 referer_fix2=Cara lain, anda boleh mengkonfigurasi Webmin untuk membenarkan pautan ini dengan menggunakan arahan consol : <ul><li>Log masuk sebagai <tt>root</tt>, dan sunting fail <tt>/etc/webmin/config</tt>.</li><li>Tambah <tt>referers=$1</tt> pada baris akhir, atau jika baris <tt>referers</tt> sudah wujud tambah <tt>$1</tt> padanya.</li><li>Simpan fail tersebut.</li></ul>
 referer_fix2u=Cara lain, anda boleh mengkonfigurasi Webmin untuk membenarkan pautan tidak dikenali dengan : <ul><li>Log masuk sebagai <tt>root</tt>, dan sunting fail <tt>/etc/webmin/config</tt>.</li><li>Cari baris <tt>referers_none=1</tt> dan ubahkan kepada <tt>referers_none=0</tt>.</li><li>Simpan fail tersebut.</li></ul>
 

lang/mt.auto

@@ -125,7 +125,7 @@ help_eexec=$1 falla : $2
 referer_title=Twissija dwar is-Sigurtà
 referer_warn=<b>Twissija!</b> Webmin sab li l-programm $2 kien marbut mal-URL $1, li jidher li huwa barra l- Server Webmin Dan jista 'jkun attentat biex iħejji lis-server tiegħek biex iwettaq kmand perikoluż.
 referer_warn_unknown=<b>Twissija!</b> Webmin sab li l-programm $1 kien marbut ma 'URL mhux magħruf, li jidher li huwa barra mis-server Webmin. Dan jista 'jkun attentat biex iħejji lis-server tiegħek biex iwettaq kmand perikoluż.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Kun żgur li l-browser tiegħek huwa kkonfigurat biex jibgħat informazzjoni referrer sabiex tkun tista 'tiġi verifikata minn Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/no

@@ -125,7 +125,7 @@ help_eexec=$1 misslykket : $2
 referer_title=Sikkerhetsadvarsel
 referer_warn=<b>Advarsel!</b> Webmin har oppdaget at URL $1 linken til programmet $2, ser ut til å være utenfor Webmin serveren. Dette kan være ett forsøk på å lure din server til å utføre ett farligt kommando.
 referer_warn_unknown=<b>Advarsel!</b> Webmin har oppdaget at programmet $1 ble lenket til fra en ukjent URL, som ser ut til å ligge utenfor Webmin serveren. Dette kan være ett forsøk på å lure din server til å utføre en farlig kommando.
-referer_fix1=Dersom dette er en gyldig lenke, kan du tillate lenker fra denne URLen på følgende måte:<ul><li>Logg inn på Webmin på vanlig måte.<li>Gå til <b>Webmin konfigurasjon</b> modulen.<li>Klikk på ikonet Betrodde referenter.<li>Skriv inn vertsnavnet $1 inn i feltet <b>Betrodde nettsteder</b>, og klikk <b>Lagre</b>.</ul>
+referer_fix1=Dersom dette er en gyldig lenke, kan du tillate lenker fra denne URLen på følgende måte:<ul><li>Logg inn på Webmin på vanlig måte.<li>Gå til <b>Webmin konfigurasjon</b> modulen.<li>Klikk på ikonet Betrodde referenter.<li>Skriv inn vertsnavnet $1 inn i feltet <b>Betrodde nettsteder</b>, og klikk <b>Lagre.</b></ul>
 referer_fix2=Alternativt kan du konfigurere Webmin til å tillate denne lenken fra kommandolinjen ved å:<ul><li>Logge inn som <tt>root</tt>, og redigere filen <tt>/etc/webmin/config</tt>.<li>Legg til linjen <tt>referers=$1</tt> på slutten, eller dersom en <tt>referers</tt> linje allerede finnes legger du til <tt>$1</tt> til den.<li>Lagre filen.</ul>
 referer_fix3u=Forsikre deg om at nettleseren din er konfigurert til å sende referer-informasjon slik at den kan verifiseres av Webmin
 referer_fix2u=Alternativt kan du konfigurere Webmin til å tillate lenker fra ukjente referenter ved å :<ul><li>Logge inn som <tt>root</tt>, og redigere filen <tt>/etc/webmin/config</tt>.<li>Finn linjen <tt>referers_none=1</tt> og endre den til <tt>referers_none=0</tt>.<li>Lagre filen.</ul>

lang/pl

@@ -121,7 +121,7 @@ help_eexec=$1 błąd : $2
 referer_title=Uwaga niebezpieczeństwo!
 referer_warn=<b>Uwaga!</b> Webmin wykrył, że program $2 jest dowiązany do URL-a $1 znajdującego się poza serwerem Webmina. Może to być próba podstępnego zmuszenia twojego serwera do wykonania niebezpiecznego polecenia.
 referer_warn_unknown=<b>Uwaga!</b> Webmin wykrył, że program $1 jest dowiązany do nieznanego URL-a znajdującego się poza serwerem Webmina. Może to być próba podstępnego zmuszenia twojego serwera do wykonania niebezpiecznego polecenia.
-referer_fix1=Jeśli jest to uzasadnione połączenie, możesz pozwolić na połączenia z  tego URL w następujący sposób: <ul><li>Zaloguj się do Webmina.<li>Przejdź do modułu <b>Konfiguracja Webmina</b>.<li>Kliknij na ikonę Zaufane odnośniki.<li>Wprowadź nazwę komputera $1 do pola <b>Zaufane witryny</b>, i kliknij <b>Zapisz</b>.</ul>
+referer_fix1=Jeśli jest to uzasadnione połączenie, możesz pozwolić na połączenia z  tego URL w następujący sposób: <ul><li>Zaloguj się do Webmina.<li>Przejdź do modułu <b>Konfiguracja Webmina</b>.<li>Kliknij na ikonę Zaufane odnośniki.<li>Wprowadź nazwę komputera $1 do pola <b>Zaufane witryny</b>, i kliknij <b>Zapisz.</b></ul>
 referer_fix2=Możesz też tak skonfigurować webmina aby zezwalał na to połączenie używając wiersza poleceń: <ul><li>Zaloguj jako <tt>root</tt> i edytuj plik <tt>/etc/webmin/config</tt>.<li>Dodaj linię <tt>referers=$1</tt> na końcu pliku, lub jeśli wiersz <tt>referers</tt> już istnieje - dodaj do niej <tt>$1</tt>.<li>Zapisz plik.</ul>
 referer_fix3u=Upewnij się, że twoja przeglądarka jest skonfigurowana do wysyłania referrera, aby mógł być on zweryfikowany przez Webmina.
 referer_fix2u=Możesz też tak skonfigurować webmina aby zezwalał na połączenia z nieznanych odsyłaczy w następujący sposób:<ul><li>Zaloguj się jako <tt>root</tt> i edytuj plik <tt>/etc/webmin/config</tt>.<li>Odnajdź wiersz <tt>referers_none=1</tt> i zmień go na <tt>referers_none=0</tt>.<li>Zapisz plik.</ul>

lang/pt_BR.auto

@@ -45,7 +45,7 @@ modules_clear=Claro
 config_emodule=O módulo não existe
 config_ewebmin=O tipo de parâmetro 14 funciona apenas no Webmin
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Verifique se o seu navegador está configurado para enviar informações de referência para que possam ser verificadas pelo Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/ro.auto

@@ -16,7 +16,7 @@ chooser_eopen=Listarea a eșuat : $1
 
 config_emodule=Modulul nu există
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Asigurați-vă că browserul dvs. este configurat pentru a trimite informații referrer, astfel încât acestea să poată fi verificate de Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/ru

@@ -114,7 +114,7 @@ help_eexec=Ошибка $1 : $2
 referer_title=Предупреждение о безопасности
 referer_warn=<b>Внимание!</b> Webmin определил, что ссылка на программу $2 была произведена с URL $1, который находится вне сервера Webmin. Это может быть попыткой обмануть ваш сервер с целью запуска опасной команды..
 referer_warn_unknown=<b>Внимание!</b> Webmin определил, что ссылка на программу $1 была произведена с неизвестного URL, который находится вне сервера Webmin. Это может быть попыткой обмануть ваш сервер с целью запуска опасной команды..
-referer_fix1=Если это - легитимная ссылка, Вы можете разрешить ссылки от этого URL следующим образом :<ul><li>Войдите в Webmin.<li>Перейдите в модуль <b>Настройка Webmin</b>.<li>Нажмите на иконку "Проверка ссылок".<li>Введите имя хоста $1 в поле <b>Список доверенных сайтов</b>, и нажмите <b>Сохранить</b>.</ul>
+referer_fix1=Если это - легитимная ссылка, Вы можете разрешить ссылки от этого URL следующим образом :<ul><li>Войдите в Webmin.<li>Перейдите в модуль <b>Настройка Webmin</b>.<li>Нажмите на иконку "Проверка ссылок".<li>Введите имя хоста $1 в поле <b>Список доверенных сайтов</b>, и нажмите <b>Сохранить.</b></ul>
 referer_fix2=Или же, вы можете настроить Webmin для разрешения этой ссылки через командную строку:<ul><li>Войдите как <tt>root</tt>, и отредактируйте файл <tt>/etc/webmin/config</tt>.<li>Добавьте строку <tt>referers=$1</tt> в конец файла, или если строка <tt>referers</tt> уже существует, добавьте <tt>$1</tt> к ней.<li>Сохраните файл.</ul>
 referer_fix2u=Или же, вы можете настроить Webmin для разрешения ссылок с неизвестными referers:<ul><li>Войдите как <tt>root</tt>, и отредактируйте файл <tt>/etc/webmin/config</tt>.<li>Найдите строку <tt>referers_none=1</tt> и измените еЈ на <tt>referers_none=0</tt>.<li>Сохраните файл.</ul>
 

lang/sk.auto

@@ -34,7 +34,7 @@ modules_clear=jasný
 
 config_emodule=Modul neexistuje
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Uistite sa, že váš prehliadač je nakonfigurovaný na odosielanie informácií o sprostredkovateľovi, aby ich mohol overiť Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/sl.auto

@@ -125,7 +125,7 @@ help_eexec=$1 neuspešno : $2
 referer_title=Varnostno opozorilo
 referer_warn=<b>Opozorilo!</b> Webmin je odkril, da je bil program $2 povezan z URL-jem $1, ki se zdi zunaj Webmin strežnik. To je morda poskus, da bi vaši strežnik zvabil v izvajanje nevarnega ukaza.
 referer_warn_unknown=<b>Opozorilo!</b> Webmin je odkril, da je bil program $1 povezan z neznanim URL-jem, ki se zdi zunaj strežnika Webmin. To je morda poskus, da bi vaši strežnik zvabil v izvajanje nevarnega ukaza.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Prepričajte se, da je vaš brskalnik konfiguriran za pošiljanje napotitvenih informacij, da jih Webmin lahko preveri.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/sv.auto

@@ -58,7 +58,7 @@ config_setto=Satt till
 config_ewebmin=Parameter typ 14 fungerar bara i Webmin
 
 referer_warn_unknown=<b>Varning!</b> Webmin har upptäckt att programmet $1 länkades till från en okänd URL, som verkar vara utanför Webmin-servern. Detta kan vara ett försök att lura din server att utföra ett farligt kommando.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Se till att din webbläsare är konfigurerad för att skicka referensinformation så att den kan verifieras av Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/th.auto

@@ -53,7 +53,7 @@ config_nochange=อย่าเปลี่ยน
 config_setto=ตั้งค่าให้
 config_ewebmin=พารามิเตอร์ประเภท 14 ใช้งานได้ใน Webmin เท่านั้น
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=ตรวจสอบให้แน่ใจว่าเบราว์เซอร์ของคุณได้รับการกำหนดค่าให้ส่งข้อมูลผู้อ้างอิงเพื่อให้ Webmin สามารถตรวจสอบได้
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/tr.auto

@@ -57,7 +57,7 @@ config_setto=Ayarlanır
 config_ewebmin=Parametre tipi 14 yalnızca Webmin'de çalışır
 
 referer_warn_unknown=<b>Uyarı!</b> Webmin, $1 programının, Webmin sunucusunun dışında görünen bilinmeyen bir URL'den bağlandığını tespit etti. Bu, sunucunuzu tehlikeli bir komut yürütmesi için kandırmaya çalışmak olabilir.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Tarayıcınızın Webmin tarafından doğrulanabilmesi için yönlendirme bilgileri gönderecek şekilde yapılandırıldığından emin olun.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/uk.auto

@@ -16,7 +16,7 @@ chooser_eopen=Помилка лістингу : $1
 
 config_emodule=Модуль не існує
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Переконайтеся, що ваш веб-переглядач налаштований для надсилання інформації про референс, щоб його можна було перевірити Webmin.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/ur.auto

@@ -125,7 +125,7 @@ help_eexec=$1 failed : $2
 referer_title=حفاظتی انتباہ
 referer_warn=<b>Warning!</b> Webmin has detected that the program $2 was linked to from the URL $1, which appears to be outside the Webmin server. This may be an attempt to trick your server into executing a dangerous command.
 referer_warn_unknown=<b>Warning!</b> Webmin has detected that the program $1 was linked to from an unknown URL, which appears to be outside the Webmin server. This may be an attempt to trick your server into executing a dangerous command.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=یقینی بنائیں کہ آپ کے براؤزر کو حوالہ دہندہ کی معلومات بھیجنے کے لئے ترتیب دیا گیا ہے تاکہ اس کی تصدیق ویبمین کے ذریعہ کی جاسکے۔
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/vi.auto

@@ -125,7 +125,7 @@ help_eexec=$1 không thành công : $2
 referer_title=Cảnh báo an ninh
 referer_warn=<b> Cảnh báo! Máy chủ Webmin. Đây có thể là một nỗ lực để lừa máy chủ của bạn thực hiện một lệnh nguy hiểm.
 referer_warn_unknown=<b>Cảnh báo!</b> Webmin đã phát hiện ra rằng chương trình $1 được liên kết đến từ một URL không xác định, có vẻ như nằm ngoài máy chủ Webmin. Đây có thể là một nỗ lực để lừa máy chủ của bạn thực hiện một lệnh nguy hiểm.
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=Đảm bảo trình duyệt của bạn được định cấu hình để gửi thông tin giới thiệu để Webmin có thể được xác minh.
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

lang/zh.auto

@@ -27,7 +27,7 @@ modules_cancel=取消
 
 config_emodule=模块不存在
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!
 

lang/zh_TW.auto

@@ -35,7 +35,7 @@ modules_clear=明確
 config_emodule=模塊不存在
 config_ewebmin=參數類型14僅在Webmin中有效
 
-referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save</b></li>.</ul>
+referer_fix1=If this is a legitimate link, you can allow links from this URL as follows :<ul><li>Login to Webmin normally.</li><li>Go to the <b>Webmin Configuration</b> module.</li><li>Click on the Trusted Referrers icon.</li><li>Enter the hostname $1 into the <b>Trusted websites</b> field, and click <b>Save.</b></li></ul>
 referer_fix2=Alternately, you can configure Webmin to allow this link from the command line by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Add the line <tt>referers=$1</tt> at the end, or if a <tt>referers</tt> line already exists add <tt>$1</tt> to it.</li><li>Save the file.</li></ul>
 referer_fix3u=確保將瀏覽器配置為發送引薦來源信息，以便Webmin可以對其進行驗證。
 referer_fix2u=Alternately, you can configure Webmin to allow links from unknown referers by :<ul><li>Login as <tt>root</tt>, and edit the <tt>/etc/webmin/config</tt> file.</li><li>Find the line <tt>referers_none=1</tt> and change it to <tt>referers_none=0</tt>.</li><li>Save the file.</li></ul><p></p>WARNING - this has the side effect of opening your system up to reflected XSS attacks and so is not recommended!

makedebian.pl

@@ -51,7 +51,11 @@ $ver = $ARGV[0];
 if ($ARGV[1]) {
 	$rel = "-".$ARGV[1];
 	}
--r "tarballs/$product-$ver.tar.gz" || die "tarballs/$product-$ver.tar.gz not found";
+$tarfile = "tarballs/$product-$ver$rel.tar.gz";
+if (!-r $tarfile) {
+	$tarfile = "tarballs/$product-$ver.tar.gz";
+	}
+-r $tarfile || die "$tarfile not found";
 
 # Create the base directories
 print "Creating Debian package of ",ucfirst($product)," ",$ver,$rel," ..\n";
@@ -65,7 +69,7 @@ system("mkdir -p $doc_dir");
 system("mkdir -p $bin_dir");
 
 # Un-tar the package to the correct locations
-system("gunzip -c tarballs/$product-$ver.tar.gz | (cd $tmp_dir ; tar xf -)") &&
+system("gunzip -c $tarfile | (cd $tmp_dir ; tar xf -)") &&
 	die "un-tar failed!";
 system("mv $tmp_dir/$product-$ver/* $usr_dir");
 rmdir("$tmp_dir/$product-$ver");
@@ -87,6 +91,12 @@ system("cd $usr_dir && chmod -R og-w .");
 if ($< == 0) {
 	system("cd $usr_dir && chown -R root:bin .");
 	}
+if ($ARGV[1] && $ARGV[1] > 1) {
+	system("echo $ARGV[1] >$usr_dir/release");
+	}
+else {
+	system("rm -f $usr_dir/release");
+	}
 
 # Create the link to webmin command
 if ($product eq "webmin") {
@@ -266,6 +276,10 @@ if [ -d "/etc/$baseproduct" ]; then
 	justinstalled=0
 fi
 inetd=`grep "^inetd=" /etc/$baseproduct/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
+productpidfile=`grep "^pidfile=" /etc/$baseproduct/miniserv.conf 2>/dev/null | sed -e 's/pidfile=//g'`
+if [ -r "\$productpidfile" ]; then
+	productrunning=1
+fi
 if [ "\$1" = "configure" ]; then
 	# Upgrading the package, so stop the old Webmin properly
 	if [ "\$inetd" != "1" ]; then
@@ -325,7 +339,7 @@ if [ "\$inetd" != "1" ]; then
 	if [ "\$justinstalled" = "1" ]; then
 		/etc/$baseproduct/start >/dev/null 2>&1 </dev/null
 		if [ "\$?" != "0" ]; then
-			echo "E: \${productucf} server cannot be started. It is advised to start it manually\n   by running \\"/etc/$baseproduct/restart-by-force-kill\\" command"
+			echo "E: \${productucf} server cannot be started. It is advised to start it manually by\n   running \\"/etc/$baseproduct/restart-by-force-kill\\" command"
 		fi
 	else
 		if [ "$product" = "webmin" ]; then
@@ -333,12 +347,18 @@ if [ "\$inetd" != "1" ]; then
 				/etc/$baseproduct/.post-install >/dev/null 2>&1 </dev/null
 			else
 				/etc/$baseproduct/.reload-init >/dev/null 2>&1 </dev/null
+				if [ -f /etc/$baseproduct/.reload-init-systemd ]; then
+					/etc/$baseproduct/.reload-init-systemd >/dev/null 2>&1 </dev/null
+					rm -f /etc/$baseproduct/.reload-init-systemd
+				fi
 			fi
 		else
-			/etc/$baseproduct/restart >/dev/null 2>&1 </dev/null
+			if [ "\$productrunning" = "1" ]; then
+				/etc/$baseproduct/restart >/dev/null 2>&1 </dev/null
+			fi
 		fi
 		if [ "\$?" != "0" ]; then
-			echo "W: \${productucf} server cannot be restarted. It is advised to restart it manually\n   by running \\"/etc/$baseproduct/restart-by-force-kill\\" command when upgrade process is finished"
+			echo "W: \${productucf} server cannot be restarted. It is advised to restart it manually by\n   running \\"/etc/$baseproduct/restart-by-force-kill\\" command when upgrade process is finished"
 		fi
 	fi
 fi
@@ -436,9 +456,9 @@ system("fakeroot dpkg --build $tmp_dir deb/${product}_${ver}${rel}_all.deb") &&
 	die "dpkg failed";
 #system("rm -rf $tmp_dir");
 print "Wrote deb/${product}_${ver}${rel}_all.deb\n";
-$md5 = `md5sum tarballs/$product-$ver$rel.tar.gz`;
+$md5 = `md5sum $tarfile`;
 $md5 =~ s/\s+.*\n//g;
-@st = stat("tarballs/$product-$ver.tar.gz");
+@st = stat($tarfile);
 
 # Create the .diff file, which just contains the debian directory
 $diff_orig_dir = "$tmp_dir/$product-$ver-orig";

makedist.pl

@@ -14,7 +14,7 @@ $fullvers =~ /^([0-9\.]+)(\-(\d+))?$/ || usage();
 $vers = $1;
 $release = $3;
 $tardir = $min ? "minimal" : "tarballs";
-$vfile = $min ? "$vers-minimal" : $vers;
+$vfile = $min ? "$fullvers-minimal" : $fullvers;
 $zipdir = "zips";
 $vers || usage();
 

makerpm.pl

@@ -60,7 +60,20 @@ $maketemp =~ s/\\/\\\\/g;
 $maketemp =~ s/`/\\`/g;
 $maketemp =~ s/\$/\\\$/g;
 
-system("cp tarballs/webmin-$ver.tar.gz $source_dir");
+if ($rel && $rel > 1) {
+	$makerel = "echo $rel >%{buildroot}/usr/libexec/webmin/release";
+	}
+else {
+	$makerel = "rm -f %{buildroot}/usr/libexec/webmin/release";
+	}
+
+if ($rel > 1 && -r "tarballs/webmin-$ver-$rel.tar.gz") {
+	$tarfile = "webmin-$ver-$rel.tar.gz";
+	}
+else {
+	$tarfile = "webmin-$ver.tar.gz";
+	}
+system("cp tarballs/$tarfile $source_dir");
 open(SPEC, ">$spec_dir/webmin-$ver.spec");
 print SPEC <<EOF;
 %global __perl_provides %{nil}
@@ -78,7 +91,7 @@ Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) p
 AutoReq: 0
 License: BSD-3-clause
 Group: System/Tools
-Source: http://www.webmin.com/download/%{name}-%{version}.tar.gz
+Source: http://www.webmin.com/download/$tarfile
 Vendor: Jamie Cameron
 BuildRoot: /tmp/%{name}-%{version}
 BuildArchitectures: noarch
@@ -113,6 +126,7 @@ ln -s /usr/libexec/webmin/bin/webmin %{buildroot}/usr/bin
 rm %{buildroot}/usr/libexec/webmin/blue-theme
 cp -rp %{buildroot}/usr/libexec/webmin/gray-theme %{buildroot}/usr/libexec/webmin/blue-theme
 echo rpm >%{buildroot}/usr/libexec/webmin/install-type
+$makerel
 
 %clean
 #%{rmDESTDIR}
@@ -220,16 +234,20 @@ if [ "\$inetd" != "1" ]; then
 	if [ "\$1" == 1 ]; then
 		/etc/webmin/start >/dev/null 2>&1 </dev/null
 		if [ "\$?" != "0" ]; then
-			echo "error: Webmin server cannot be started. It is advised to start it manually\n       by running \\"/etc/webmin/restart-by-force-kill\\" command"
+			echo "error: Webmin server cannot be started. It is advised to start it manually by\n       running \\"/etc/webmin/restart-by-force-kill\\" command"
 		fi
 	else
 		if [ "\$killmodenone" != "1" ]; then
 			/etc/webmin/.post-install >/dev/null 2>&1 </dev/null
 		else
 			/etc/webmin/.reload-init >/dev/null 2>&1 </dev/null
+			if [ -f /etc/webmin/.reload-init-systemd ]; then
+				/etc/webmin/.reload-init-systemd >/dev/null 2>&1 </dev/null
+				rm -f /etc/webmin/.reload-init-systemd
+			fi
 		fi
 		if [ "\$?" != "0" ]; then
-			echo "warning: Webmin server cannot be restarted. It is advised to restart it manually\n         by running \\"/etc/webmin/restart-by-force-kill\\" when upgrade process is finished"
+			echo "warning: Webmin server cannot be restarted. It is advised to restart it manually by\n         running \\"/etc/webmin/restart-by-force-kill\\" when upgrade process is finished"
 		fi
 	fi
 fi

miniserv.pl

@@ -1433,29 +1433,17 @@ elsif ($reqline !~ /^(\S+)\s+(.*)\s+HTTP\/1\..$/) {
 			}
 		local $url = $wantport == 443 ? "https://$urlhost/"
 					      : "https://$urlhost:$wantport/";
-		if ($config{'ssl_redirect'}) {
-			# Just re-direct to the correct URL
-			sleep(1);	# Give browser a change to finish
-					# sending its request
-			&write_data("HTTP/1.0 302 Moved Temporarily\r\n");
-			&write_data("Date: $datestr\r\n");
-			&write_data("Server: $config{'server'}\r\n");
-			&write_data("Location: $url\r\n");
-			&write_keep_alive(0);
-			&write_data("\r\n");
-			return 0;
-		} elsif ($config{'hide_admin_url'} != 1) {
-			# Tell user the correct URL
-			&http_error(200, "Document follows",
-				"This web server is running in SSL mode. ".
-				"Try the URL <a href='$url'>$url</a> ".
-				"instead.", 0, 1);
-		} else {
-			# Throw an error
-			&http_error(404, "Page not found",
-			    "The requested URL was not found on this server.")
+		&http_error(200, "Document follows",
+			"This web server is running in SSL mode. ".
+			"Try the URL <a href='$url'>$url</a> instead.".
+			"<script>".
+			"if (location.protocol != 'https:') {".
+			"  location.protocol = 'https:';".
+			"}".
+			"</script>",
+			0, 1);
 		}
-	} elsif (ord(substr($reqline, 0, 1)) == 128 && !$use_ssl) {
+	elsif (ord(substr($reqline, 0, 1)) == 128 && !$use_ssl) {
 		# This could be an https request when it should be http ..
 		# need to fake a HTTP response
 		eval <<'EOF';
@@ -1491,24 +1479,7 @@ elsif ($reqline !~ /^(\S+)\s+(.*)\s+HTTP\/1\..$/) {
 			local $url = $config{'musthost'} ?
 					"https://$config{'musthost'}:$port/" :
 					"https://$host:$port/";
-			if ($config{'ssl_redirect'}) {
-				# Just re-direct to the correct URL
-				sleep(1);	# Give browser a change to
-						# finish sending its request
-				&write_data("HTTP/1.0 302 Moved Temporarily\r\n");
-				&write_data("Date: $datestr\r\n");
-				&write_data("Server: $config{'server'}\r\n");
-				&write_data("Location: $url\r\n");
-				&write_keep_alive(0);
-				&write_data("\r\n");
-				return 0;
-			} elsif ($config{'hide_admin_url'} != 1) {
-				# Tell user the correct URL
-				&http_error(200, "Bad Request", "This web server is not running in SSL mode. Try the URL <a href='$url'>$url</a> instead.", 0, 1);
-			} else {
-				&http_error(404, "Page not found",
-				    "The requested URL was not found on this server.");
-			}
+			&http_error(200, "Bad Request", "This web server is not running in SSL mode. Try the URL <a href='$url'>$url</a> instead.", 0, 1);
 EOF
 		if ($@) {
 			&http_error(400, "Bad Request");

mysql/index.cgi

@@ -322,9 +322,9 @@ else {
 		push(@needs, "DBD::mysql") if ($@);
 		if (@needs) {
 			$needs = &urlize(join(" ", @needs));
-			print "<center><b>",&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs,
-				"/cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".&urlize($text{'index_return'})),
-				"</b></center>\n";
+			print "<b>".&ui_text_color(&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs,
+				"../cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".
+				  &urlize($text{'index_return'})), 'warn')."</b>";
 			}
 		}
 	}

os_list.txt

@@ -150,6 +150,7 @@ Linux Mint			17.2	debian-linux	8.0	`cat /etc/lsb-release 2>/dev/null | grep DIST
 Linux Mint			17.3	debian-linux	8.0	`cat /etc/lsb-release 2>/dev/null | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 17.3 Rosa"/
 Linux Mint			18	debian-linux	8.0	`cat /etc/lsb-release 2>/dev/null | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 18 Sarah"/
 Linux Mint			18.1	debian-linux	8.0	`cat /etc/lsb-release 2>/dev/null | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 18.1 Serena"/
+Linux Mint			$1		debian-linux	11.0	`cat /etc/lsb-release 2>/dev/null | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint ([0-9\.]+)\s+\w+/
 
 # Debian Linux versions with numbers
 Debian Linux			$1	debian-linux	$1	$etc_issue =~ /Debian.*\s([0-9\.]+)\s/i || `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/

postgresql/index.cgi

@@ -292,9 +292,9 @@ if (&foreign_available("cpan")) {
 	push(@needs, "DBD::Pg") if ($@);
 	if (@needs) {
 		$needs = &urlize(join(" ", @needs));
-		print "<center><b>",&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs,
-			"/cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".&urlize($text{'index_return'})),
-			"</b></center>\n";
+		print "<b>".&ui_text_color(&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs,
+			"../cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".
+			    &urlize($text{'index_return'})), 'warn')."</b>";
 		}
 	}
 

proc/linux-lib.pl

@@ -496,11 +496,13 @@ sub get_current_cpu_data
 {
 my @cpu;
 my @fans;
+my @cputhermisters;
 if (&has_command("sensors")) {
     my ($cpu, $cpu_aux, $cpu_package, $cpu_broadcom, $cpu_amd);
     my $fh = "SENSORS";
 
     # Examples https://gist.github.com/547451c9ca376b2d18f9bb8d3748276c
+    # &open_execute_command($fh, "cat /tmp/.webmin/sensors </dev/null 2>/dev/null", 1);
     &open_execute_command($fh, "sensors </dev/null 2>/dev/null", 1);
 
     while (<$fh>) {
@@ -517,6 +519,15 @@ if (&has_command("sensors")) {
                 }
         ) if ($cpu_fan_num);
 
+        # AMD CPU Thermisters #1714
+        if ($cpu && /thermistor\s+[\d]+:\s+[+-]([\d]+)/i) {
+            my $temp = int($1);
+            push(@cputhermisters,
+                 {  'core' => scalar(@cputhermisters) + 1,
+                    'temp' => $temp
+                 }) if ($temp);
+            }
+
         # CPU package
         ($cpu_package) = $_ =~ /(?|(package\s+id\s+[\d]+)|(coretemp-[a-z]+-[\d]+))/i
           if (!$cpu_package);
@@ -549,7 +560,7 @@ if (&has_command("sensors")) {
         # Non-standard outputs
         else {
 
-        	# Auxiliary CPU temperature and fans were already captured
+            # Auxiliary CPU temperature and fans were already captured
             next if ($cpu_aux);
 
             # CPU types
@@ -628,6 +639,8 @@ if (&has_command("sensors")) {
         }
     close($fh);
     }
+@cpu = @cputhermisters
+    if (!@cpu && @cputhermisters);
 return (\@cpu, \@fans);
 }
 

servers/index.cgi

@@ -104,7 +104,16 @@ elsif (@servers) {
 	my (@afters, @befores);
 	if ($access{'edit'}) {
 		my $sep = length($text{'index_edit'}) > 10 ? "<br>" : " ";
-		@afters = map { $sep.&ui_link("edit_serv.cgi?id=".$_->{'id'}, "(".$text{'index_edit'}.")" ) } @servers;
+		my $logout = sub {
+			my ($l) = @_;
+			my $logout_link = "";
+			if (&logged_in($l)) {
+			 	$logout_link =
+			 		&ui_link("logout.cgi?id=$l->{'id'}", "(".$text{'index_logout'}.") ");
+			 	}
+			 return $logout_link;
+		};
+		@afters = map { $sep.&$logout($_).&ui_link("edit_serv.cgi?id=".$_->{'id'}, "(".$text{'index_edit'}.")" ) } @servers;
 		@befores = map { &ui_checkbox("d", $_->{'id'}) } @servers;
 		}
 	my @titles = map { &make_iconname($_) } @servers;
@@ -186,9 +195,6 @@ elsif ($_[0]->{'realhost'}) {
 else {
 	$rv = "$_[0]->{'host'}:$_[0]->{'port'}";
 	}
-if (&logged_in($_[0])) {
-	$rv .= "</a> <a href='logout.cgi?id=$_->{'id'}'>(".$text{'index_logout'}.")";
-	}
 return $rv;
 }
 

setup.pl

@@ -9,6 +9,7 @@ use Socket;
 # Find install directory
 $ENV{'LANG'} = '';
 $0 =~ s/\\/\//g;
+$bootscript = $ENV{'bootscript'} || "webmin";
 if ($0 =~ /^(.*)\//) {
 	chdir($1);
 	}
@@ -83,9 +84,13 @@ print "Webmin uses separate directories for configuration files and log files.\n
 print "Unless you want to run multiple versions of Webmin at the same time\n";
 print "you can just accept the defaults.\n";
 print "\n";
-print "Config file directory [/etc/webmin]: ";
+my $envetcdir = $ENV{'config_directory'} || "/etc/webmin";
+print "Config file directory [$envetcdir]: ";
 if ($ENV{'config_directory'}) {
 	$config_directory = $ENV{'config_directory'};
+	print "$envetcdir\n";
+	print ".. predefined\n";
+	$envetcdirexists = 1;
 	}
 else {
 	chop($config_directory = <STDIN>);
@@ -96,11 +101,11 @@ if ($config_directory !~ /^([a-z]:)?\//i) {
 	&errorexit("Config directory must be an absolute path");
 	}
 if (!-d $config_directory) {
-	mkdir($config_directory, 0755) ||
+	make_dir_recursive_local($config_directory, 0755) ||
 		&errorexit("Failed to create directory $config_directory");
 	}
 if (-r "$config_directory/config") {
-	print ".. found\n";
+	print ".. found\n" if (!$envetcdirexists);
 	$upgrading = 1;
 	}
 
@@ -121,8 +126,17 @@ if ($upgrading) {
 	open(VAR, "$config_directory/var-path");
 	chop($var_dir = <VAR>);
 	$var_directory = $var_dir;
+	$ENV{'WEBMIN_VAR'} = $var_directory;
 	close(VAR);
 
+	# Get current bootscript name
+	if (-r "$config_directory/bootscript-name") {
+		open(BOOTVAR, "$config_directory/bootscript-name");
+		chop($newbootscript = <BOOTVAR>);
+		close(BOOTVAR);
+		$bootscript = $newbootscript if ($newbootscript);
+		}
+
 	# Force creation if non-existant
 	mkdir($var_dir, 0755);
 
@@ -188,7 +202,8 @@ else {
 		}
 
 	# Ask for log directory
-	print "Log file directory [/var/webmin]: ";
+	my $envvardir = $ENV{'var_dir'} || "/var/webmin";
+	print "Log file directory [$envvardir]: ";
 	if ($ENV{'var_dir'}) {
 		$var_dir = $ENV{'var_dir'};
 		}
@@ -205,7 +220,7 @@ else {
 		&errorexit("Log directory cannot be /");
 		}
 	if (!-d $var_dir) {
-		mkdir($var_dir, 0755) ||
+		make_dir_recursive_local($var_dir, 0755) ||
 			&errorexit("Failed to create directory $var_dir");
 		}
 	$ENV{'WEBMIN_VAR'} = $var_dir;
@@ -375,6 +390,9 @@ else {
 	open(VAR, ">$config_directory/var-path");
 	print VAR $var_dir,"\n";
 	close(VAR);
+	open(BOOTS, ">$config_directory/bootscript-name");
+	print BOOTS $bootscript,"\n";
+	close(BOOTS);
 
 	print "Creating web server config files ..\n";
 	$ufile = "$config_directory/miniserv.users";
@@ -534,13 +552,13 @@ if (!$ENV{'noperlpath"'} && $os_type ne 'windows') {
 	print ".. done\n";
         print "\n";
 	}
-
+my $systemctlcmd = &has_command('systemctl');
 print "Creating start and stop scripts ..\n";
 if ($os_type eq "windows") {
 	open(START, ">>$config_directory/start.bat");
 	print START "$perl \"$wadir/miniserv.pl\" $config_directory/miniserv.conf\n";
 	close(START);
-	$start_cmd = "sc start ".($ENV{'bootscript'} || "webmin");
+	$start_cmd = "sc start $bootscript";
 
 	open(STOP, ">>$config_directory/stop.bat");
 	print STOP "echo Not implemented\n";
@@ -591,18 +609,18 @@ else {
 	print STOP "  echo Stopping Webmin server in $wadir\n";
 	print STOP "fi\n";
 	print STOP "pidfile=\`grep \"^pidfile=\" $config_directory/miniserv.conf | sed -e 's/pidfile=//g'\`\n";
-	print STOP "pid=\`cat \$pidfile\` 2>/dev/null\n";
+	print STOP "pid=\`cat \$pidfile 2>/dev/null\`\n";
 	print STOP "if [ \"\$pid\" != \"\" ]; then\n";
 	print STOP "  kill \$pid || exit 1\n";
 	print STOP "  touch $var_dir/stop-flag\n";
 	print STOP "  if [ \"\$1\" = \"--kill\" ]; then\n";
 	print STOP "    sleep 1\n";
-	print STOP "    ((ps axf | grep \"webmin\\\/miniserv\\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) || kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null\n";
+	print STOP "    ((ps axf | grep \"$wadir\\\/miniserv\\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) || kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null\n";
 	print STOP "  fi\n";
 	print STOP "  exit 0\n";
 	print STOP "else\n";
 	print STOP "  if [ \"\$1\" = \"--kill\" ]; then\n";
-	print STOP "    (ps axf | grep \"webmin\\\/miniserv\\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) 2>/dev/null\n";
+	print STOP "    (ps axf | grep \"$wadir\\\/miniserv\\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) 2>/dev/null\n";
 	print STOP "  fi\n";
 	print STOP "fi\n";
 	close(STOP);
@@ -629,6 +647,18 @@ else {
 	print RELOAD "kill -USR1 \`cat \$pidfile\`\n";
 	close(RELOAD);
 
+	# Switch to systemd from init (intermediate)
+	if ($killmodenonepl == 1 && -x $systemctlcmd) {
+		if ($ver < 1.994) {
+			open(SDRELOAD, ">$config_directory/.reload-init-systemd");
+			print SDRELOAD "#!/bin/sh\n";
+			print SDRELOAD "$config_directory/.stop-init\n";
+			print SDRELOAD "$config_directory/start\n";
+			close(SDRELOAD);
+			chmod(0755, "$config_directory/.reload-init-systemd");
+			}
+		}
+
 	# Pre install
 	open(PREINST, ">$config_directory/.pre-install");
 	print PREINST "#!/bin/sh\n";
@@ -671,7 +701,6 @@ else {
 	symlink("$config_directory/.reload-init", "$config_directory/reload");
 
 	# For systemd
-	my $systemctlcmd = &has_command('systemctl');
 	if (-x $systemctlcmd) {
 
 		# Clear existing
@@ -683,42 +712,42 @@ else {
 		
 		# Start systemd
 		open(STARTD, ">$config_directory/start");
-		print STARTD "$systemctlcmd start webmin\n";
+		print STARTD "$systemctlcmd start $bootscript\n";
 		close(STARTD);
 		
 		# Stop systemd
 		open(STOPD, ">$config_directory/stop");
-		print STOPD "$systemctlcmd stop webmin\n";
+		print STOPD "$systemctlcmd stop $bootscript\n";
 		close(STOPD);
 
 		# Restart systemd
 		open(RESTARTD, ">$config_directory/restart");
-		print RESTARTD "$systemctlcmd restart webmin\n";
+		print RESTARTD "$systemctlcmd restart $bootscript\n";
 		close(RESTARTD);
 
 		# Force reload systemd
 		open(FRELOADD, ">$config_directory/restart-by-force-kill");
-		print FRELOADD "$systemctlcmd stop webmin\n";
+		print FRELOADD "$systemctlcmd stop $bootscript\n";
 		print FRELOADD "$config_directory/.stop-init --kill >/dev/null 2>&1\n";
-		print FRELOADD "$systemctlcmd start webmin\n";
+		print FRELOADD "$systemctlcmd start $bootscript\n";
 		close(FRELOADD);
 
 		# Reload systemd
 		open(RELOADD, ">$config_directory/reload");
-		print RELOADD "$systemctlcmd reload webmin\n";
+		print RELOADD "$systemctlcmd reload $bootscript\n";
 		close(RELOADD);
 
 		# Pre install
 		open(PREINSTT, ">$config_directory/.pre-install");
 		print PREINSTT "#!/bin/sh\n";
-		#print PREINSTT "$systemctlcmd kill --signal=SIGSTOP --kill-who=main webmin\n";
+		#print PREINSTT "$systemctlcmd kill --signal=SIGSTOP --kill-who=main $bootscript\n";
 		close(PREINSTT);
 
 		# Post install
 		open(POSTINSTT, ">$config_directory/.post-install");
 		print POSTINSTT "#!/bin/sh\n";
-		#print POSTINSTT "$systemctlcmd kill --signal=SIGCONT --kill-who=main webmin\n";
-		print POSTINSTT "$systemctlcmd kill --signal=SIGHUP --kill-who=main webmin\n";
+		#print POSTINSTT "$systemctlcmd kill --signal=SIGCONT --kill-who=main $bootscript\n";
+		print POSTINSTT "$systemctlcmd kill --signal=SIGHUP --kill-who=main $bootscript\n";
 		close(POSTINSTT);
 
 		chmod(0755, "$config_directory/start");
@@ -732,7 +761,7 @@ else {
 		# Fix existing systemd webmin.service file to update start and stop commands
 		my $perl = &get_perl_path();
 		chdir("$wadir/init");
-		system("$perl ".&quote_path("$wadir/init/updateboot.pl")." webmin");
+		system("$perl ".&quote_path("$wadir/init/updateboot.pl")." $bootscript");
 	}
 }
 print ".. done\n";
@@ -794,7 +823,7 @@ $gconfig{'product'} ||= "webmin";
 if ($makeboot) {
 	print "Configuring Webmin to start at boot time ..\n";
 	chdir("$wadir/init");
-	system("$perl ".&quote_path("$wadir/init/atboot.pl")." ".$ENV{'bootscript'});
+	system("$perl ".&quote_path("$wadir/init/atboot.pl")." $bootscript");
 	print ".. done\n";
 	print "\n";
 	}
@@ -894,8 +923,17 @@ if (!$ENV{'nostart'}) {
 		if ($upgrading) {
 			$action = 'restart';
 		}
+		my $start_cmd_extra;
+		if ($upgrading && $killmodenonepl == 1) {
+			$start_cmd_extra = "$config_directory/.reload-init-systemd";
+			if (-r $start_cmd_extra) {
+				$start_cmd .= " ; $start_cmd_extra";
+				}
+			}
 		print "Attempting to $action Webmin web server ..\n";
 		$ex = system($start_cmd);
+		unlink($start_cmd_extra)
+			if (-r $start_cmd_extra);
 		if ($ex) {
 			&errorexit("Failed to $action web server!");
 			}
@@ -971,3 +1009,18 @@ closedir(DIR);
 return @rv;
 }
 
+sub make_dir_recursive_local
+{
+my ($dir, $mod) = @_;
+my @folders = split(/\//, $dir);
+my $folder_created;
+foreach my $folder (@folders) {
+    next if (!$folder);
+    $folder_created .= "/$folder";
+    if (mkdir($folder_created)) {
+        chmod($mod, $folder_created)
+            if ($mod && -d $folder_created);
+        }
+    }
+return -d $dir;
+}

setup.sh

@@ -8,6 +8,11 @@ LANG=
 export LANG
 LANGUAGE=
 export LANGUAGE
+
+if [ "$bootscript" = "" ]; then
+	bootscript="webmin"
+fi
+
 cd `dirname $0`
 if [ -x /bin/pwd ]; then
 	wadir=`/bin/pwd`
@@ -105,7 +110,12 @@ echo "Webmin uses separate directories for configuration files and log files."
 echo "Unless you want to run multiple versions of Webmin at the same time"
 echo "you can just accept the defaults."
 echo ""
-printf "Config file directory [/etc/webmin]: "
+envetcdir="$config_dir"
+if [ "$envetcdir" = "" ]; then
+	envetcdir=/etc/webmin
+	envetcdirnotfound=1
+fi
+printf "Config file directory [$envetcdir]: "
 if [ "$config_dir" = "" ]; then
 	read config_dir
 fi
@@ -119,7 +129,7 @@ if [ "$abspath" = "" ]; then
 	exit 2
 fi
 if [ ! -d $config_dir ]; then
-	mkdir $config_dir;
+	mkdir -p $config_dir;
 	if [ $? != 0 ]; then
 		echo "ERROR: Failed to create directory $config_dir"
 		echo ""
@@ -127,8 +137,17 @@ if [ ! -d $config_dir ]; then
 	fi
 fi
 if [ -r "$config_dir/config" -a -r "$config_dir/var-path" -a -r "$config_dir/perl-path" ]; then
-	echo ".. found"
+	if [ "$envetcdirnotfound" = "" ]; then
+		echo "$envetcdir"
+		echo ".. predefined"
+	else
+		echo ".. found"
+	fi
 	upgrading=1
+else
+	if [ "$envetcdirnotfound" = "" ]; then
+		echo "$envetcdir"
+	fi
 fi
 
 # Check if upgrading from an old version
@@ -138,6 +157,14 @@ if [ "$upgrading" = 1 ]; then
 	# Get current var path
 	var_dir=`cat $config_dir/var-path`
 
+	# Get current bootscript
+	if [ -r "$config_dir/bootscript-name" ]; then
+		newbootscript=`cat $config_dir/bootscript-name`
+		if [ "$newbootscript" != "" ]; then
+			bootscript="$newbootscript"
+		fi
+	fi
+
 	# Force creation if non-existant
 	mkdir -p $var_dir >/dev/null 2>&1
 
@@ -211,7 +238,12 @@ else
 	fi
 
 	# Ask for log directory
-	printf "Log file directory [/var/webmin]: "
+	envvardir="$var_dir"
+	if [ "$envvardir" = "" ]; then
+		envvardir=/var/webmin
+		envvardirnotfound=1
+	fi
+	printf "Log file directory [$envvardir]: "
 	if [ "$var_dir" = "" ]; then
 		read var_dir
 	fi
@@ -230,13 +262,16 @@ else
 		exit 3
 	fi
 	if [ ! -d $var_dir ]; then
-		mkdir $var_dir
+		mkdir -p $var_dir
 		if [ $? != 0 ]; then
 			echo "ERROR: Failed to create directory $var_dir"
 			echo ""
 			exit 3
 		fi
 	fi
+	if [ "$upgrading" != 1 -a "$envetcdirnotfound" = "" ]; then
+		echo "$envvardir"
+	fi
 	echo ""
 
 	# Ask where perl is installed
@@ -479,6 +514,7 @@ else
 	# Create webserver config file
 	echo $perl > $config_dir/perl-path
 	echo $var_dir > $config_dir/var-path
+	echo $bootscript > $config_dir/bootscript-name
 	echo "Creating web server config files .."
 	cfile=$config_dir/miniserv.conf
 	echo "port=$port" >> $cfile
@@ -618,6 +654,9 @@ if [ ! -f "$config_dir/.pre-install" ]; then
 	killmodenonesh=1
 fi
 
+# Test if we have systemd system
+systemctlcmd=`which systemctl 2>/dev/null`
+
 # Re-generating main scripts
 echo "Creating start and stop init scripts .."
 # Start main
@@ -644,18 +683,18 @@ echo "else" >>$config_dir/.stop-init
 echo "  echo Stopping Webmin server in $wadir" >>$config_dir/.stop-init
 echo "fi" >>$config_dir/.stop-init
 echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/.stop-init
-echo "pid=\`cat \$pidfile\` 2>/dev/null" >>$config_dir/.stop-init
+echo "pid=\`cat \$pidfile 2>/dev/null\`" >>$config_dir/.stop-init
 echo "if [ \"\$pid\" != \"\" ]; then" >>$config_dir/.stop-init
 echo "  kill \$pid || exit 1" >>$config_dir/.stop-init
 echo "  touch $var_dir/stop-flag" >>$config_dir/.stop-init
 echo "  if [ \"\$1\" = \"--kill\" ]; then" >>$config_dir/.stop-init
 echo "    sleep 1" >>$config_dir/.stop-init
-echo "    ((ps axf | grep \"webmin\/miniserv\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) || kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null" >>$config_dir/.stop-init
+echo "    ((ps axf | grep \"$wadir\/miniserv\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) || kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null" >>$config_dir/.stop-init
 echo "  fi" >>$config_dir/.stop-init
 echo "  exit 0" >>$config_dir/.stop-init
 echo "else" >>$config_dir/.stop-init
 echo "  if [ \"\$1\" = \"--kill\" ]; then" >>$config_dir/.stop-init
-echo "    (ps axf | grep \"webmin\/miniserv\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) 2>/dev/null" >>$config_dir/.stop-init
+echo "    (ps axf | grep \"$wadir\/miniserv\.pl\" | awk '{print \"kill -9 -- -\" \$1}' | bash) 2>/dev/null" >>$config_dir/.stop-init
 echo "  fi" >>$config_dir/.stop-init
 echo "fi" >>$config_dir/.stop-init
 # Restart main
@@ -671,6 +710,17 @@ echo "#!/bin/sh" >$config_dir/.reload-init
 echo "echo Reloading Webmin server in $wadir" >>$config_dir/.reload-init
 echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/.reload-init
 echo "kill -USR1 \`cat \$pidfile\`" >>$config_dir/.reload-init
+# Switch to systemd from init (intermediate)
+if [ "$killmodenonesh" = "1" ] && [ -x "$systemctlcmd" ]; then
+	current_version=`cat "$config_dir/version" 2>/dev/null`
+	ancient_version=`echo $current_version 1.994 | awk '{if ($1 < $2) print 1; else print 0}'`
+	if [ "$ancient_version" = "1" ]; then
+		echo "#!/bin/sh" >$config_dir/.reload-init-systemd
+		echo "$config_dir/.stop-init" >>$config_dir/.reload-init-systemd
+		echo "$config_dir/start" >>$config_dir/.reload-init-systemd
+		chmod 755 $config_dir/.reload-init-systemd
+	fi
+fi
 # Pre install
 echo "#!/bin/sh" >$config_dir/.pre-install
 echo "$config_dir/.stop-init" >>$config_dir/.pre-install
@@ -699,38 +749,37 @@ ln -s $config_dir/.restart-by-force-kill-init $config_dir/restart-by-force-kill
 ln -s $config_dir/.reload-init $config_dir/reload >/dev/null 2>&1
 
 # For systemd create different start/stop scripts
-systemctlcmd=`which systemctl 2>/dev/null`
 if [ -x "$systemctlcmd" ]; then
 	rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/restart-by-force-kill $config_dir/reload
 
 	echo "Creating start and stop scripts (systemd) .."
 	# Start systemd
 	echo "#!/bin/sh" >$config_dir/start
-	echo "$systemctlcmd start webmin" >>$config_dir/start
+	echo "$systemctlcmd start $bootscript" >>$config_dir/start
 	# Stop systemd
 	echo "#!/bin/sh" >$config_dir/stop
-	echo "$systemctlcmd stop webmin" >>$config_dir/stop
+	echo "$systemctlcmd stop $bootscript" >>$config_dir/stop
 	# Restart systemd
 	echo "#!/bin/sh" >$config_dir/restart
-	echo "$systemctlcmd restart webmin" >>$config_dir/restart
+	echo "$systemctlcmd restart $bootscript" >>$config_dir/restart
 	# Force reload systemd
 	echo "#!/bin/sh" >$config_dir/restart-by-force-kill
-	echo "$systemctlcmd stop webmin" >>$config_dir/restart-by-force-kill
+	echo "$systemctlcmd stop $bootscript" >>$config_dir/restart-by-force-kill
 	echo "$config_dir/.stop-init --kill >/dev/null 2>&1" >>$config_dir/restart-by-force-kill
-	echo "$systemctlcmd start webmin" >>$config_dir/restart-by-force-kill
+	echo "$systemctlcmd start $bootscript" >>$config_dir/restart-by-force-kill
 	# Reload systemd
 	echo "#!/bin/sh" >$config_dir/reload
-	echo "$systemctlcmd reload webmin" >>$config_dir/reload
+	echo "$systemctlcmd reload $bootscript" >>$config_dir/reload
 	# Pre-install on systemd
 	echo "#!/bin/sh" >$config_dir/.pre-install
-	# echo "$systemctlcmd kill --signal=SIGSTOP --kill-who=main webmin" >>$config_dir/.pre-install
+	# echo "$systemctlcmd kill --signal=SIGSTOP --kill-who=main $bootscript" >>$config_dir/.pre-install
 	# Post-install on systemd
 	echo "#!/bin/sh" >$config_dir/.post-install
-	# echo "$systemctlcmd kill --signal=SIGCONT --kill-who=main webmin" >>$config_dir/.post-install
-	echo "$systemctlcmd kill --signal=SIGHUP --kill-who=main webmin" >>$config_dir/.post-install
+	# echo "$systemctlcmd kill --signal=SIGCONT --kill-who=main $bootscript" >>$config_dir/.post-install
+	echo "$systemctlcmd kill --signal=SIGHUP --kill-who=main $bootscript" >>$config_dir/.post-install
 
 	# Fix existing systemd webmin.service file to update start and stop commands
-	(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/updateboot.pl" "webmin")
+	(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/updateboot.pl" "$bootscript")
 	
 	chmod 755 $config_dir/stop $config_dir/start $config_dir/restart $config_dir/restart-by-force-kill $config_dir/reload $config_dir/.pre-install $config_dir/.post-install
 else

usermin/index.cgi

@@ -49,10 +49,9 @@ if (!$miniserv{'root'} && !-d $miniserv{'root'}) {
 	exit;
 	}
 
-$ver = &get_usermin_version();
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
 	&help_search_link("usermin", "google"), undef, undef,
-	&text('index_version', &get_usermin_version(1)));
+	&text('index_version', &get_usermin_version(1, 1)));
 
 @links = ( "edit_access.cgi",
 	   "edit_bind.cgi",

usermin/usermin-lib.pl

@@ -57,26 +57,35 @@ sub put_usermin_miniserv_config
 &write_file($usermin_miniserv_config, \%usermin_miniserv_config_cache);
 }
 
-=head2 get_usermin_version
+=head2 get_usermin_version([format_dev_version], [include_release])
 
 Returns the version number of Usermin on this system.
 
 =cut
 sub get_usermin_version
 {
-my ($ui_format_dev) = @_;
+my ($ui_format_dev, $inc_release_version) = @_;
 local %miniserv;
 &get_usermin_miniserv_config(\%miniserv);
 open(VERSION, "<$miniserv{'root'}/version");
 local $version = <VERSION>;
 close(VERSION);
 $version =~ s/\r|\n//g;
+my $release_version = "";
+# Usermin minor version
+if ($inc_release_version) {
+	my $usermin_version_release = read_file_contents("$miniserv{'root'}/release") || "";
+	$usermin_version_release =~ s/\r|\n//g;
+	$release_version = "-".$usermin_version_release
+	    if ($usermin_version_release > 1);
+	}
+
 # Format dev version nicely
 if ($ui_format_dev && length($version) == 13) {
-	return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1);
+	return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1) . $release_version;
 	}
 else {
-	return $version;
+	return $version . $release_version;
 	}
 }
 

version

@@ -1 +1 @@
-1.999
+2.000

web-lib-funcs.pl

@@ -49,26 +49,27 @@ parameters are :
 =cut
 sub read_file
 {
+my ($file, $hash, $order, $lowercase, $split) = @_;
+$split = "=" if (!defined($split));
+my $realfile = &translate_filename($file);
+&open_readfile(ARFILE, $file) || return 0;
 local $_;
-my $split = defined($_[4]) ? $_[4] : "=";
-my $realfile = &translate_filename($_[0]);
-&open_readfile(ARFILE, $_[0]) || return 0;
 while(<ARFILE>) {
 	s/\r|\n//g;
-	my $hash = index($_, "#");
+	my $cmt = index($_, "#");
 	my $eq = index($_, $split);
-	if ($hash != 0 && $eq >= 0) {
+	if ($cmt != 0 && $eq >= 0) {
 		my $n = substr($_, 0, $eq);
 		my $v = substr($_, $eq+1);
 		chomp($v);
-		$_[1]->{$_[3] ? lc($n) : $n} = $v;
-		push(@{$_[2]}, $n) if ($_[2]);
+		$hash->{$lowercase ? lc($n) : $n} = $v;
+		push(@$order, $n) if ($order);
         	}
         }
 close(ARFILE);
 $main::read_file_missing{$realfile} = 0;	# It exists now
 if (defined($main::read_file_cache{$realfile})) {
-	%{$main::read_file_cache{$realfile}} = %{$_[1]};
+	%{$main::read_file_cache{$realfile}} = %$hash;
 	}
 return 1;
 }
@@ -140,7 +141,7 @@ Write out the contents of a hash as name=value lines. The parameters are :
 
 =item sort - If given, passed hash reference will be sorted by its keys
 
-=item sorted-by - If given, hash reference that is being saved will be sorted by the keys of sorted-by hashref
+=item sorted-by - If given, passed as full path to a file, will use its content to sort the keys
 
 =item sorted-by-sectioning-preserved - If sorted-by is used, then preserve the sectioning (line-breaks), and section comment as in hash reference
 
@@ -159,28 +160,31 @@ my $realfile = &translate_filename($file);
 &read_file($sorted_by || $file, \%old, \@order);
 &open_tempfile(ARFILE, ">$file");
 if ($sort || $gconfig{'sortconfigs'}) {
-    foreach $k (sort keys %{$data_hash}) {
-        (print ARFILE $k,$join,$data_hash->{$k},"\n") ||
-            &error(&text("efilewrite", $realfile, $!));
-        
-        }
-    }
+	# Always sort by keys
+	foreach $k (sort keys %{$data_hash}) {
+		(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+			&error(&text("efilewrite", $realfile, $!));
+		}
+	}
 else {
-    my %done;
-    foreach $k (@order) {
-        if (exists($data_hash->{$k}) && !$done{$k}++) {
-            (print ARFILE $k,$join,$data_hash->{$k},"\n") ||
-                &error(&text("efilewrite", $realfile, $!));
-            }
-        }
-    foreach $k (keys %{$data_hash}) {
-        if (!exists($old{$k}) && !$done{$k}++) {
-            (print ARFILE $k,$join,$data_hash->{$k},"\n") ||
-                &error(&text("efilewrite", $realfile, $!));
-            }
-        }
-    }
+	# Where possible, write out in the original order
+	my %done;
+	foreach $k (@order) {
+		if (exists($data_hash->{$k}) && !$done{$k}++) {
+			(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+				&error(&text("efilewrite", $realfile, $!));
+			}
+		}
+	foreach $k (keys %{$data_hash}) {
+		if (!exists($old{$k}) && !$done{$k}++) {
+			(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+				&error(&text("efilewrite", $realfile, $!));
+			}
+		}
+	}
 &close_tempfile(ARFILE, %{$data_hash} ? 1 : 0);
+
+# Update in-memory caches
 if (defined($main::read_file_cache{$realfile})) {
     %{$main::read_file_cache{$realfile}} = %{$data_hash};
     }
@@ -189,53 +193,53 @@ if (defined($main::read_file_missing{$realfile})) {
     }
 
 if ($sorted_by && $sorted_by_sectioning_preserved) {
-    my $target = read_file_contents($file);
-    my $model = read_file_contents($sorted_by);
+	my $target = read_file_contents($file);
+	my $model = read_file_contents($sorted_by);
 
-    # Extract version related comments for a block, e.g. #1.962
-    my %comments = reverse ($model =~ m/(#\s*[\d\.]+)[\n\s]+(.*?)=/gm);
+	# Extract version related comments for a block, e.g. #1.962
+	my %comments = reverse ($model =~ m/(#\s*[\d\.]+)[\n\s]+(.*?)=/gm);
 
-    # Build blocks of line's key separated with a new line break
-    my @lines = (($model =~ m/(.*?)$join|(^\s*$)/gm), undef, undef);
-    my @blocks;
-    my @block;
-    for (my $line = 0; $line < scalar(@lines) - 1; $line += 2) {
-        if ($lines[$line] =~ /\S+/) {
-            push(@block, $lines[$line]);
-            }
-        else {
-            push(@blocks, [@block]);
-            @block = ();
-            }
-        }
-    for (my $block = 0; $block <= scalar(@blocks) - 1; $block++) {
-        foreach my $line (@{$blocks[$block]}) {
-            # Add a comment to the first block element
-            if ($target =~ /(\Q$line\E)=(.*)/) {
-                foreach my $comment (keys %comments) {
-                    if (grep(/^\Q$comment\E$/, @{$blocks[$block]})) {
-                        $target =~ s/(\Q$line\E)=(.*)/$comments{$comment}\n$1=$2/;
-                        last;
-                        }
-                    }
-                last;
-                }
-            }
-        foreach my $line (reverse @{$blocks[$block]}) {
-            if (
-                # Go to another block immediately
-                # if new line already exists
-                $target =~ /(\Q$line\E)$join.*?(\r?\n|\r\n?)+$/m ||
+	# Build blocks of line's key separated with a new line break
+	my @lines = (($model =~ m/(.*?)$join|(^\s*$)/gm), undef, undef);
+	my @blocks;
+	my @block;
+	for (my $line = 0; $line < scalar(@lines) - 1; $line += 2) {
+		if ($lines[$line] =~ /\S+/) {
+			push(@block, $lines[$line]);
+			}
+		else {
+			push(@blocks, [@block]);
+			@block = ();
+			}
+		}
+	for (my $block = 0; $block <= scalar(@blocks) - 1; $block++) {
+		foreach my $line (@{$blocks[$block]}) {
+			# Add a comment to the first block element
+			if ($target =~ /(\Q$line\E)=(.*)/) {
+				foreach my $comment (keys %comments) {
+					if (grep(/^\Q$comment\E$/, @{$blocks[$block]})) {
+						$target =~ s/(\Q$line\E)=(.*)/$comments{$comment}\n$1=$2/;
+						last;
+					}
+				}
+			last;
+			}
+		}
+		foreach my $line (reverse @{$blocks[$block]}) {
+			if (
+			    # Go to another block immediately
+			    # if new line already exists
+			    $target =~ /(\Q$line\E)$join.*?(\r?\n|\r\n?)+$/m ||
 
-                # Add new line to the last element of
-                # the block and go to another block
-                $target =~ s/(\Q$line\E)$join(.*)/$1=$2\n/) {
-                last;
-                }
-            }
-        }
-    write_file_contents($file, $target);
-    }
+			    # Add new line to the last element of
+			    # the block and go to another block
+			    $target =~ s/(\Q$line\E)$join(.*)/$1=$2\n/) {
+				last;
+				}
+			}
+		}
+		&write_file_contents($file, $target);
+	}
 }
 
 =head2 html_escape(string)
@@ -965,6 +969,9 @@ sub PrintHeader
 {
 my ($cs, $mt) = @_;
 $mt ||= "text/html";
+if (!$gconfig{'no_strict_transport_security'} && uc($ENV{'HTTPS'}) eq "ON") {
+	print "Strict-Transport-Security: max-age=31536000; includeSubDomains\n";
+	}
 if ($pragma_no_cache || $gconfig{'pragma_no_cache'}) {
 	print "pragma: no-cache\n";
 	print "Expires: Thu, 1 Jan 1970 00:00:00 GMT\n";
@@ -4165,7 +4172,6 @@ Returns the version of Webmin currently being run, such as 1.450.
 =cut
 sub get_webmin_version
 {
-my ($ui_format_dev) = @_;
 if (!$get_webmin_version) {
 	$get_webmin_version = &read_file_contents("$root_directory/version");
 	$get_webmin_version =~ s/\r|\n//g;
@@ -4189,6 +4195,18 @@ if (!defined($get_webmin_version_release)) {
 return $get_webmin_version_release;
 }
 
+=head2 get_webmin_full_version
+
+Returns the full version of Webmin currently being run, such as 1.450-3
+
+=cut
+sub get_webmin_full_version
+{
+my $ver = &get_webmin_version();
+my $rel = &get_webmin_version_release();
+return $ver.($rel ? "-".$rel : "");
+}
+
 =head2 get_module_acl([user], [module], [no-rbac], [no-default])
 
 Returns a hash containing access control options for the given user and module.
@@ -6988,6 +7006,34 @@ if (!$exists) {
 return 1;
 }
 
+=head2 make_dir_recursive(dir, [mod])
+
+Unless in read-only mode, creates a directory (recursively).
+Sets directory permissions for newly created directory,
+if called. This is pure Perl implementation.
+
+=cut
+sub make_dir_recursive
+{
+my ($dir, $mod) = @_;
+if (&is_readonly_mode()) {
+    print STDERR "Vetoing directory $dir\n";
+    return 1;
+    }
+$dir = &translate_filename($dir);
+my @folders = split(/\//, $dir);
+my $folder_created;
+foreach my $folder (@folders) {
+    next if (!$folder);
+    $folder_created .= "/$folder";
+    if (mkdir($folder_created)) {
+        chmod($mod, $folder_created)
+            if ($mod && -d $folder_created);
+        }
+    }
+return -d $dir;
+}
+
 =head2 set_ownership_permissions(user, group, perms, file, ...)
 
 Sets the user, group owner and permissions on some files. The parameters are :

webmin/change_ssl.cgi

@@ -12,7 +12,6 @@ $miniserv{'ssl'} = $in{'ssl'};
 &validate_key_cert($in{'key'}, $in{'cert_def'} ? undef : $in{'cert'});
 $miniserv{'keyfile'} = $in{'key'};
 $miniserv{'certfile'} = $in{'cert_def'} ? undef : $in{'cert'};
-$miniserv{'ssl_redirect'} = $in{'ssl_redirect'};
 $miniserv{'no_sslcompression'} = !$in{'ssl_compression'};
 $miniserv{'ssl_honorcipherorder'} = $in{'ssl_honorcipherorder'};
 if ($in{'version_def'}) {

webmin/edit_ssl.cgi

@@ -65,9 +65,6 @@ print ui_table_row($text{'ssl_cert'},
 			$text{'ssl_cert_def'}."<br>",$text{'ssl_cert_oth'})." ".
 	file_chooser_button("cert"));
 
-print ui_table_row($text{'ssl_redirect'},
-	ui_yesno_radio("ssl_redirect", $miniserv{'ssl_redirect'}));
-
 print ui_table_row($text{'ssl_version'},
 	ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
 			$text{'ssl_auto'}));

webmin/index.cgi

@@ -10,9 +10,10 @@ require './webmin-lib.pl';
 our (%in, %text, %gconfig, %config);
 my $ver = &get_webmin_version();
 my $rel = &get_webmin_version_release();
-$ver .= "-".$rel if ($rel);
+$ver .= "-".$rel if ($rel && $rel > 1);
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
-	undef, undef, undef, &text('index_version', $ver));
+	undef, undef, undef,
+	&text('index_version', $ver));
 my %access = &get_module_acl();
 &ReadParse();
 

webmin/lang/en

@@ -342,7 +342,6 @@ ssl_key=Private key file
 ssl_cert=Certificate file
 ssl_cert_def=Same file as private key
 ssl_cert_oth=Separate file
-ssl_redirect=Redirect non-SSL requests to SSL mode?
 ssl_deny=SSL protocol versions to reject
 ssl_compression=Allow compressed SSL connections?
 ssl_honorcipherorder=Force use of server-defined cipher order?

webmin/upgrade.cgi

@@ -19,16 +19,13 @@ if ($in{'source'} == 0) {
 	&error_setup(&text('upgrade_err1', $in{'file'}));
 	$file = $in{'file'};
 	if (!-r $file) { &inst_error($text{'upgrade_efile'}); }
-	if ($file =~ /webmin-(\d+\.\d+)/) {
+	if ($file =~ /webmin-(\d+\.\d+)(\-(\d+))?/) {
 		$version = $1;
+		$release = $3;
+		$full = $version.($release ? "-$release" : "");
 		}
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		&check_inst_version($full);
 		}
 	}
 elsif ($in{'source'} == 1) {
@@ -42,8 +39,10 @@ elsif ($in{'source'} == 1) {
 	open(MOD, ">$file");
 	print MOD $in{'upload'};
 	close(MOD);
-	if ($in{'upload_filename'} =~ /webmin-(\d+\.\d+)/) {
+	if ($in{'upload_filename'} =~ /webmin-(\d+\.\d+)(\-(\d+))?/) {
 		$version = $1;
+		$release = $3;
+		$full = $version.($release ? "-$release" : "");
 		}
 	}
 elsif ($in{'source'} == 2) {
@@ -51,13 +50,10 @@ elsif ($in{'source'} == 2) {
 	&error_setup($text{'upgrade_err3'});
 	($ok, $version, $release) = &get_latest_webmin_version();
 	$ok || &inst_error($version);
+	$full = $version.($release ? "-$release" : "");
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		# Is the new version and release actually newer
+		&check_inst_version($full);
 		}
 	if ($in{'mode'} eq 'rpm') {
 		# Downloading RPM
@@ -111,8 +107,10 @@ elsif ($in{'source'} == 5) {
 	else { &inst_error($text{'upgrade_eurl'}); }
 	$need_unlink = 1;
 	$error && &inst_error($error);
-	if ($in{'url'} =~ /webmin-(\d+\.\d+)/) {
+	if ($in{'url'} =~ /webmin-(\d+\.\d+)(\-(\d+))?/) {
 		$version = $1;
+		$release = $3;
+		$full = $version.($release ? "-$release" : "");
 		}
 	}
 elsif ($in{'source'} == 3) {
@@ -152,14 +150,14 @@ if ($in{'sig'}) {
 			if ($in{'source'} == 2) {
 				# Download the key for this tar.gz
 				my ($sigtemp, $sigerror);
-				&http_download($update_host, $update_port, "/download/sigs/webmin-$version.tar.gz-sig.asc", \$sigtemp, \$sigerror);
+				&http_download($update_host, $update_port, "/download/sigs/webmin-$full.tar.gz-sig.asc", \$sigtemp, \$sigerror);
 				if ($sigerror) {
 					$ec = 4;
 					$emsg = &text('upgrade_edownsig',
 						      $sigerror);
 					}
 				else {
-					my $data =&read_file_contents($file);
+					my $data = &read_file_contents($file);
 					my ($vc, $vmsg) =
 					    &verify_data($data, $sigtemp);
 					if ($vc > 1) {
@@ -221,16 +219,15 @@ if ($in{'mode'} eq 'rpm') {
 		close(RPM);
 		}
 	$out = &backquote_command("rpm -qp $qfile");
-	$out =~ /(^|\n)\Q$rpmname\E-(\d+\.\d+)/ ||
+	$out =~ /(^|\n)\Q$rpmname\E-(\d+\.\d+)-(\d+)/ ||
+	        /(^|\n)\Q$rpmname\E-(\d+\.\d+)/ ||
 		&inst_error($text{'upgrade_erpm'});
 	$version = $2;
+	$release = $3;
+	$full = $version.($release ? "-$release" : "");
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		# Is the new version and release actually newer
+		&check_inst_version($full);
 		}
 
 	# Install the RPM
@@ -262,14 +259,10 @@ elsif ($in{'mode'} eq 'deb') {
 		&inst_error($text{'upgrade_edeb'});
 	$out =~ /Version:\s+(\S+)/ ||
 		&inst_error($text{'upgrade_edeb'});
-	$version = $1;
+	$full = $1;
+	($version, $release) = split(/\-/, $full);
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		&check_inst_version($full);
 		}
 
 	# Install the package
@@ -382,12 +375,7 @@ elsif ($in{'mode'} eq 'gentoo') {
 	close(EMERGE);
 	$version || &inst_error($text{'upgrade_egentoo'});
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		&check_inst_version($version);
 		}
 
 	# Install the Gentoo package
@@ -399,7 +387,7 @@ elsif ($in{'mode'} eq 'gentoo') {
 	}
 else {
 	# Check if it is a webmin tarfile
-	open(TAR, "tar tf $file 2>&1 |");
+	open(TAR, "tar tf $qfile 2>&1 |");
 	while(<TAR>) {
 		s/\r|\n//g;
 		if (/^webmin-([0-9\.]+)\//) {
@@ -439,12 +427,7 @@ else {
 			}
 		}
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
-			&inst_error(&text('upgrade_elatest', $version));
-			}
-		elsif ($version <= &get_webmin_version()) {
-			&inst_error(&text('upgrade_eversion', $version));
-			}
+		&check_inst_version($version);
 		}
 
 	# Work out where to extract
@@ -515,11 +498,11 @@ else {
 	if (!$?) {
 		if ($in{'delete'}) {
 			# Can delete the old root directory
-			system("rm -rf \"$root_directory\"");
+			system("rm -rf ".quotemeta($root_directory));
 			}
 		elsif ($in{'dir'}) {
 			# Can delete the temporary source directory
-			system("rm -rf \"$extract\"");
+			system("rm -rf ".quotemeta($extract));
 			}
 		&lock_file("$config_directory/config");
 		$gconfig{'upgrade_delete'} = $in{'delete'};
@@ -573,3 +556,16 @@ print "$main::whatfailed : $_[0] <p>\n";
 exit;
 }
 
+sub check_inst_version
+{
+my ($full) = @_;
+return if ($done_check_inst_version++);	  # Full version may have been checked
+					  # in a previous call
+my $curr_full = &get_webmin_full_version();
+if (&compare_version_numbers($full, $curr_full) == 0) {
+	&inst_error(&text('upgrade_elatest', $full));
+	}
+elsif (&compare_version_numbers($full, $curr_full) < 0) {
+	&inst_error(&text('upgrade_eversion', $full));
+	}
+}

webmin/webmin-lib.pl

@@ -1254,14 +1254,12 @@ if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &
 			&save_module_config();
 			}
 		}
-	my $ver = &get_webmin_version();
-	my $rel = &get_webmin_version_release();
-	my $full = $ver.($rel ? "-".$rel : "");
-	if ($config{'last_version_number'} &&
-	    ($config{'last_version_number'} > $ver ||
-	     $config{'last_version_number'} == $ver &&
-	     $config{'last_version_release'} &&
-	     $config{'last_version_release'} > $rel)) {
+	my $minor_release =
+		$config{'last_version_release'} &&
+		$config{'last_version_release'} >= 2;
+	my $full = &get_webmin_full_version();
+	if ($config{'last_version_full'} &&
+	    &compare_version_numbers($config{'last_version_full'}, $full) > 0) {
 		# New version is out there .. offer to upgrade
 		my $mode = &get_install_type();
 		my $checksig = 0;
@@ -1271,6 +1269,12 @@ if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &
 				$checksig = 1;
 				}
 			}
+		my $release_notes_link = " ".
+		   &ui_link("https://github.com/webmin/webmin/releases/tag/".
+		     	    "$config{'last_version_number'}",
+	                    $text{'os_release_notes'}, undef,
+	                    'target="_blank" data-link-external="after"').".";
+		# $release_notes_link = "" if ($minor_release);
 		push(@notifs,
 		     &ui_form_start("@{[&get_webprefix()]}/webmin/upgrade.cgi",
 				    "form-data").
@@ -1278,10 +1282,7 @@ if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &
 		     &ui_hidden("sig", $checksig).
 		     &ui_hidden("mode", $mode).
 		     &text('notif_upgrade', $config{'last_version_full'}, $full).
-		     " ".&ui_link("https://github.com/webmin/webmin/releases/tag/".
-		     	  "$config{'last_version_number'}",
-	                 $text{'os_release_notes'}, undef,
-	                 'target="_blank" data-link-external="after"').".<p>\n".
+		     "$release_notes_link<p>\n".
 		     &ui_form_end([ [ undef, $text{'notif_upgradeok'} ] ]));
 		}
 	}