Fix to safely get user hostname from URL

*Note: It keep existing styles and using index from "add()" will also put moved options to the top of the select and make them clearly visible

CHANGELOG.md

@@ -1,12 +1,80 @@
 ## Changelog
 
-#### 2.403 (June 30, 2025)
-* Add support for the Webmin webserver to work in both HTTP and HTTPS modes at the same time
-* Add status monitor for PHP FPM #2499
-* Add support for redirecting to the enforced domain when the `musthost_redirect` directive is set
-* Add a UI API to mask sensitive text—like displayed passwords, unless hovered over container
-* Fix MySQL/MariaDB to remove obsolete `set-variable` options that break modern config files #2497
+#### 2.520 (October 2, 2025)
+* Fix to make sure the mail URL uses a well-known host name [security]
+* Fix support for other Raspberry Pi sensors #2545
+* Fix the printing of the bottom button row in the form column table
+* Fix to recommend Perl `Sys::Syslog` module #2557
+* Fix to avoid using short hostname in HTTPS redirects when an FQDN is available
+* Fix to use _/proc_ sampler instead of `vmstat` for the same output with much lower overhead
+* Fix to query specific fields in FreeBSD memory stats collection, cutting CPU use by 80%
+* Fix to kill Webmin subprocesses during RC stop on FreeBSD and other systems
+* Add a complete overhaul of `var_dump` subroutine, which is now fully portable
+* Update the Authentic theme to the latest version with various fixes:
+  - Fix the text color when reading email in the Read User Mail module [webmin#2555](https://github.com/webmin/webmin/issues/2555)
+  - Fix to ensure the selected color palette is correctly stored when changed manually [webmin#2552](https://github.com/webmin/webmin/issues/2552)
+  - Fix a bug when the Webmin version label was missing when copying to clipboard system information from the dashboard
+  - Fix DNS query spike from network stats collection on FreeBSD [webmin#2556](https://github.com/webmin/webmin/issues/2556)
+  - Fix spinner color in toast messages for dark palette
+  - Fix other bugs and add various small improvements
 
+#### 2.510 (September 16, 2025)
+* Fix to ensure DNSSEC re-signing period is less than 30 days in the BIND DNS module
+* Fix to treat 201 as a valid response code in the internal download function
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add optimizations to dashboard graphs with dynamic trimming to prevent page lagging
+  - Add improvements to how the system cache for the dashboard is updated
+  - Add support to correctly reload the page in proxy mode
+  - Add an option to choose if default page should always load when switching navigation
+  - Fix to ensure the color palette is preserved for the user [webmin#2537](https://github.com/webmin/webmin/issues/2537)
+  - Fix algorithm for calculating rows per page in data table pagination
+  - Fix the alert info box text color for dark mode
+  - Fix critical lags and appearance of Custom Commands module 
+
+#### 2.501 (September 10, 2025)
+* Add support for Raspberry Pi sensors #2539 #2517
+* Add Squid 7 support
+* Update the Authentic theme to the latest version with the following fixes:
+  - Fix broken editor in "Bootup and Shutdown" module
+
+#### 2.500 (September 4, 2025)
+* Add support for the Webmin webserver to work in both HTTP and HTTPS modes at the same time
+* Add distinct warning to the login page if the connection is not secure
+* Add support for timeouts in temporary rules in "FirewallD" module
+* Add support for the new Dovecot version 2.4
+* Add support for MariaDB version 12 #2522
+* Add support for IMAP through a local command for Usermin
+* Add latest SSLeay support for redirects to SSL work
+* Add improvements to "Bootup and Shutdown" module for _systemd_ systems
+* Add field for secondary server key in "BIND DNS Server" module
+* Add reversible encryption helpers API
+* Add API to display relative dates
+* Add API to mask sensitive text, like displayed passwords, unless hovered over
+* Add status monitor for PHP FPM #2499
+* Add support for DNF5 format in the "Software Packages" module
+* Add support for redirecting to the enforced domain when the `musthost_redirect` directive is set
+* Add option to customize the SMTP login for scheduled background monitoring in the "System and Server Status" module
+* Change to show relative dates in "Webmin Users: Current Login Sessions" and "Webmin Actions Log: Search Results" pages
+* Change "Last Logins" on the dashboard to show usernames, relative dates, and all users from the past 3 days
+* Change to always enable HSTS by default
+* Fix MySQL/MariaDB to remove obsolete `set-variable` options that break modern config files #2497
+* Fix download link in table rows in "MySQL/MariaDB Database Server" module
+* Fix module not to fail on old MySQL 5.5
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add support to automatically set the color palette based on OS or browser preferences
+  - Add improvements to tooltips in dark palette
+  - Change the default shortcut key for toggling the light/dark palette
+  - Change the default shortcut key for toggling right slider
+  - Change wording to use "shortcut" instead of "hotkey"
+  - Change the default maximum column width
+  - Fix navigation menu load in proxy mode #2502
+  - Fix navigation menu to always stay in sync with the product switch
+  - Fix sporadic issue where the navigation menu disappeared and the content page was shifted
+  - Fix info alert text color and button color in the dark palette
+  - Fix styling of checkboxes and radios for backup and restore pages in Virtualmin
+  - Fix styling for extra backup destinations in Virtualmin
+  - Fix advanced schedule display in the cron chooser in Virtualmin
+    [More details...](https://github.com/webmin/authentic-theme/releases/tag/25.00)
 
 #### 2.402 (June 16, 2025)
 * Update the Authentic theme to the latest version with various fixes and improvements
@@ -131,7 +199,7 @@
 * Update the Authentic theme to the latest version with various fixes and improvements
 
 #### 2.201 (July 24, 2024)
-* Fix real-time monitoring not updating graphs in the Dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
+* Fix real-time monitoring not updating graphs in the dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
 * Fix Terminal module to work correctly with _sudo_-capable users [#2223](https://github.com/webmin/webmin/issues/2223)
 
 #### 2.200 (July 21, 2024)
@@ -244,7 +312,7 @@
 * Add support for editing ACLs in File Manager
 * Add support to configure SSL connection for MySQL/MariaDB module
 * Add support for compressed backups in PostgreSQL module
-* Add support for displaying inodes too in Disk Usage in the Dashboard
+* Add support for displaying inodes too in Disk Usage in the dashboard
 * Add better support for CloudLinux
 * Fix to always default to RSA key type in Let's Encrypt requests
 * Fix setup repository script for Oracle
@@ -252,7 +320,7 @@
 * Fix support for SpamAssassin 4
 * Fix to use system default hashing format for `htpasswd` file
 * Fix FastRPC issues
-* Update the Authentic theme to the latest version, with sped-up Dashboard performance
+* Update the Authentic theme to the latest version, with sped-up dashboard performance
 
 #### 2.013 (January 19, 2023)
 * Fix Authentic theme issue with error handling

README-zh.md

@@ -44,7 +44,7 @@ Webmin 可以两种方法安装：
 ### 贡献者
 
 * [Joe Cooper](https://github.com/swelljoe)
-* [Ilia Rostovtsev](https://github.com/iliajie)
+* [Ilia Rostovtsev](https://github.com/iliaross)
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi) + [其他无偿奉献的开发者](https://github.com/webmin/webmin/graphs/contributors)
 

README.md

@@ -48,13 +48,13 @@ For detailed installation instructions check our guide on [webmin.com/download](
 * [Jamie Cameron](https://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
 ### Developers
-* [Ilia Rostovtsev](https://github.com/iliajie)
+* [Ilia Rostovtsev](https://github.com/iliaross)
 * [Joe Cooper](https://github.com/swelljoe)
 
 ### Contributors
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi)
-* [unknown10777](https://github.com/unknown10777) + [90 more..](https://github.com/webmin/webmin/graphs/contributors)
+* [unknown10777](https://github.com/unknown10777) + [90 more...](https://github.com/webmin/webmin/graphs/contributors)
 
 ## License
 

acl/lang/en

@@ -355,6 +355,7 @@ unix_utable=Allowed Unix users
 sessions_title=Current Login Sessions
 sessions_id=Session ID
 sessions_user=Webmin user
+sessions_login_ago=Last active ago
 sessions_login=Last active at
 sessions_host=IP address
 sessions_lview=View logs..

acl/list_sessions.cgi

@@ -28,7 +28,7 @@ print &ui_columns_start([ $text{'sessions_id'},
 			  $text{'sessions_state'},
 			  $text{'sessions_user'},
 			  $text{'sessions_host'},
-			  $text{'sessions_login'},
+			  $text{'sessions_login_ago'},
 			  $text{'sessions_actions'},
 			], 100);
 foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
@@ -68,7 +68,8 @@ foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
 		push(@cols, $user);
 		}
 	push(@cols, $lip);
-	push(@cols, &make_date($ltime));
+	push(@cols, &make_date_relative($ltime).
+			" ".&ui_help(&make_date($ltime)));
 	my @links;
 	if ($haslog) {
 		push(@links, ui_link("../webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$k", $text{'sessions_lview'}));

acl/system_info.pl

@@ -20,7 +20,12 @@ foreach my $k (keys %sessiondb) {
 	next if ($k =~ /^1111111/);
 	next if (!$sessiondb{$k});
 	my ($user, $ltime, $lip) = split(/\s+/, $sessiondb{$k});
-	next if ($user ne $remote_user && $user ne "!".$remote_user);
+	next if (&webmin_user_is_admin()
+		? ($user eq "!" ||
+		   ($user ne $remote_user &&
+		    # Show all logins for past 3 days for admin
+		    $ltime && $ltime < time() - 3*24*60*60))
+		: ($user ne $remote_user && $user ne "!".$remote_user));
 	push(@logins, [ $user, $ltime, $lip, $k ]);
 	}
 if (@logins) {
@@ -29,7 +34,8 @@ if (@logins) {
 		@logins = @logins[0..4];
 		}
 	my $html = &ui_columns_start([ $text{'sessions_host'},
-				       $text{'sessions_login'},
+				       $text{'sessions_user'},
+				       $text{'sessions_login_ago'},
 				       $text{'sessions_state'},
 				       $text{'sessions_action'} ]);
 	my $open = 0;
@@ -62,9 +68,13 @@ if (@logins) {
 		         &ui_link("@{[&get_webprefix()]}/acl/delete_session.cgi?id=$l->[3]&redirect_ref=1",
 		         $text{'sessions_kill'}))
 			}
+		my $user = $l->[0];
+		$user =~ s/^\!//;
 		$html .= &ui_columns_row([
 		          $l->[2],
-		          &make_date($l->[1]),
+		          $user,
+		          &make_date_relative($l->[1]).
+			  	"&nbsp;".&ui_help(&make_date($l->[1])),
 		          $state,
 			  &ui_links_row(\@links) ]);
 		}

backup-config/edit.cgi

@@ -15,6 +15,8 @@ if ($in{'new'}) {
 	$backup = { 'emode' => 0,
 		    'email' => $gconfig{'webmin_email_to'},
 		    'sched' => 1,
+		    'configfile' => 1,
+		    'nofiles' => 0,
 		    'mins' => 0,
 		    'hours' => 0,
 		    'days' => '*',

bin/disable-twofactor

@@ -116,4 +116,4 @@ Name of the user to disable two-factor authentication for.
 
  Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
-                Ilia Rostovtsev <ilia@virtualmin.com>
+                Ilia Ross <ilia@virtualmin.com>

bin/passwd

@@ -260,5 +260,5 @@ Set new user password. Using this option may be unsecure.
 
  Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
-                Ilia Rostovtsev <ilia@virtualmin.com>
+                Ilia Ross <ilia@virtualmin.com>
 

bin/server

@@ -174,5 +174,5 @@ sub root
 
  Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
-                Ilia Rostovtsev <ilia@virtualmin.com>
+                Ilia Ross <ilia@virtualmin.com>
 

bin/webmin

@@ -457,5 +457,5 @@ Returns Webmin and other modules and themes versions installed (only those for w
 
  Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
-                Ilia Rostovtsev <ilia@virtualmin.com>
+                Ilia Ross <ilia@virtualmin.com>
 

bind8/bind8-lib.pl

@@ -1135,6 +1135,10 @@ elsif ($type eq "CNAME") {
 	print &ui_table_row($text{'value_CNAME1'},
 	    &ui_textbox("value0", $v[0], 30)." ($text{'edit_cnamemsg'})", 3);
 	}
+elsif ($type eq "ALIAS") {
+	print &ui_table_row($text{'value_ALIAS1'},
+	    &ui_textbox("value0", $v[0], 30)." ($text{'edit_cnamemsg'})", 3);
+	}
 elsif ($type eq "MX") {
 	print &ui_table_row($text{'value_MX2'},
 	    &ui_textbox("value1", $v[1], 30));
@@ -3117,7 +3121,11 @@ $slave_error = $_[0];
 
 sub get_forward_record_types
 {
-return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
+return ("A", "NS", "CNAME",
+	$config{'allow_alias'} ? ( "ALIAS" ) : ( ),
+	"MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC",
+	"SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM",
+	$config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
 }
 
 sub get_reverse_record_types

bind8/config-AlmaLinux-6.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-CentOS-Linux-6.0-7.9

@@ -52,3 +52,4 @@ spf_record=0
 dnssec_info=1
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-CentOS-Linux-8.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

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

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-CloudLinux-8.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-Oracle-Linux-8.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

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

@@ -50,3 +50,4 @@ tmpl_dnssec_dt=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

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

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-Rocky-Linux-6.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-Scientific-Linux-6.0-ALL

@@ -47,3 +47,4 @@ restart_cmd=service named restart
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-Ubuntu-Linux-18.04-22.99

@@ -48,3 +48,4 @@ start_cmd=systemctl start bind9.service
 stop_cmd=systemctl stop bind9.service
 restart_cmd=systemctl reload bind9.service
 dnssec_period=21
+allow_alias=0

bind8/config-Ubuntu-Linux-24.04-ALL

@@ -48,3 +48,4 @@ start_cmd=systemctl start named.service
 stop_cmd=systemctl stop named.service
 restart_cmd=systemctl reload named.service
 dnssec_period=21
+allow_alias=0

bind8/config-aix

@@ -38,3 +38,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-cobalt-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-coherent-linux

@@ -44,3 +44,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-corel-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-debian-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-debian-linux-10.0-11.99

@@ -48,3 +48,4 @@ start_cmd=systemctl start bind9.service
 stop_cmd=systemctl stop bind9.service
 restart_cmd=systemctl reload bind9.service
 dnssec_period=21
+allow_alias=0

bind8/config-debian-linux-12.0-ALL

@@ -48,3 +48,4 @@ start_cmd=systemctl start named.service
 stop_cmd=systemctl stop named.service
 restart_cmd=systemctl reload named.service
 dnssec_period=21
+allow_alias=0

bind8/config-debian-linux-2.2

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-debian-linux-3.0

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-debian-linux-3.1-9.0

@@ -44,3 +44,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-freebsd-12.0-ALL

@@ -41,3 +41,4 @@ force_random=0
 spf_record=0
 pid_file=/var/run/named/pid
 dnssec_info=1
+allow_alias=0

bind8/config-freebsd-2.1-2.2

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-freebsd-3.0

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-freebsd-3.1-3.5

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-freebsd-4.0-11.0

@@ -41,3 +41,4 @@ force_random=0
 spf_record=0
 pid_file=/var/run/named/pid
 dnssec_info=1
+allow_alias=0

bind8/config-generic-linux

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-gentoo-linux

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-hpux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-irix

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-macos

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-macos-1.3-ALL

@@ -41,3 +41,4 @@ pid_file=/var/run/named/named.pid /private/var/run/named/named.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-mandrake-linux

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-mandrake-linux-10.2-ALL

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-msc-linux

@@ -42,3 +42,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-netbsd

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-open-linux

@@ -42,3 +42,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-openSUSE-Linux-15.0-ALL

@@ -48,3 +48,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-openbsd-2.5-3.1

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-openbsd-3.2-ALL

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-openmamba-linux

@@ -42,3 +42,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-openserver

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-osf1

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-pardus-linux

@@ -45,3 +45,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-redhat-linux-7.0-ALL

@@ -52,3 +52,4 @@ stop_cmd=systemctl stop named
 restart_cmd=systemctl reload named
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-redhat-linux-ALL-6.0

@@ -52,3 +52,4 @@ spf_record=0
 dnssec_info=1
 chroot=
 auto_chroot=
+allow_alias=0

bind8/config-slackware-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-slackware-linux-8.0-ALL

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-sol-linux

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-solaris

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-solaris-10-ALL

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-solaris-7-9

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-suse-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-suse-linux-8.2

@@ -45,3 +45,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-suse-linux-9.0-9.2

@@ -46,3 +46,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-suse-linux-9.3-ALL

@@ -48,3 +48,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-syno-linux

@@ -35,3 +35,4 @@ other_slaves=1
 updserial_man=1
 master_ttl=1
 dnssec_info=1
+allow_alias=0

bind8/config-trustix-linux

@@ -47,3 +47,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-trustix-linux-2.1

@@ -47,3 +47,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-trustix-linux-2.2-ALL

@@ -47,3 +47,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-turbo-linux

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-united-linux

@@ -43,3 +43,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-unixware

@@ -41,3 +41,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config-windows

@@ -58,3 +58,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+allow_alias=0

bind8/config.info

@@ -19,6 +19,7 @@ support_aaaa=Support DNS for IPv6 addresses,1,1-Yes,0-No
 allow_comments=Allow comments for records,1,1-Yes,0-No
 allow_wild=Allow wildcards?,1,1-Yes,0-No
 allow_underscore=Allow underscores in record names?,1,1-Yes,0-No
+allow_alias=Allow ALIAS records?,1,1-Yes,0-No
 short_names=Convert record names to canonical form?,1,0-Yes,1-No
 extra_forward=Extra record types for forward zones,0
 extra_reverse=Extra record types for reverse zones,0

bind8/lang/en

@@ -398,6 +398,7 @@ type_A=Address
 type_AAAA=IPv6 Address
 type_NS=Name Server
 type_CNAME=Name Alias
+type_ALIAS=Address Alias
 type_MX=Mail Server
 type_HINFO=Host Information
 type_NSEC3PARAM=DNSSEC Parameters
@@ -420,6 +421,7 @@ edit_A=Address
 edit_AAAA=IPv6 Address
 edit_NS=Name Server
 edit_CNAME=Name Alias
+edit_ALIAS=Address Alias
 edit_MX=Mail Server
 edit_HINFO=Host Information
 edit_TXT=Text
@@ -442,6 +444,7 @@ recs_A=Address
 recs_AAAA=IPv6 Address
 recs_NS=Name Server
 recs_CNAME=Name Alias
+recs_ALIAS=Address Alias
 recs_MX=Mail Server
 recs_HINFO=Host Information
 recs_TXT=Text
@@ -465,6 +468,7 @@ value_A1=Address
 value_AAAA1=IPv6 Address
 value_NS1=Name Server
 value_CNAME1=Real Name
+value_ALIAS1=Copy Address From
 value_MX1=Priority
 value_MX2=Mail Server
 value_HINFO1=Hardware
@@ -1203,6 +1207,7 @@ dnssec_secs=seconds
 dnssec_desc=Zones signed with DNSSEC typically have two keys - a zone key which must be re-generated and signed regularly, and a key signing key which remains constant. This page allows you to configure Webmin to perform this re-signing automatically.
 dnssec_err=Failed to save DNSSEC key re-signing
 dnssec_eperiod=Missing or invalid number of days between re-signs
+dnssec_eperiod30=Number of days between re-signs must be less than 30
 
 dnssectools_title=DNSSEC-Tools Automation
 dt_conf_title=DNSSEC-Tools Automation
@@ -1356,7 +1361,7 @@ xfer_done=.. from $1 : Completed OK
 xfer_count=Test transfer successfully fetched $1 records from at least one nameserver. Actual transfers by BIND should also succeed.
 xfer_none=Test transfer appeared to succeed, but didn't actually fetch any records!
 
-tls_title=SSL Keys And Certificates
+tls_title=SSL Keys and Certificates
 tls_ecannot=You are not allowed to edit SSL keys and certificates
 tls_esupport=SSL keys and certificates are not supported on this system
 tls_name=Key name
@@ -1364,8 +1369,6 @@ tls_key=Key file
 tls_cert=Certificate file
 tls_ca=CA certificate file
 tls_ca_def=None required
-tls_ecannot=You are not allowed to edit SSL keys and certificates
-tls_esupport=DNS over SSL is not supported on this system
 tls_none=No SSL keys have been added yet.
 tls_add=Add a new SSL key.
 tls_desc=The SSL keys and certificates listed on this page can be used to enable DNS over SSL/TLS.

bind8/save_dnssec.cgi

@@ -16,6 +16,7 @@ require './bind8-lib.pl';
 $access{'defaults'} || &error($text{'dnssec_ecannot'});
 
 $in{'period'} =~ /^[1-9]\d*$/ || &error($text{'dnssec_eperiod'});
+$in{'period'} < 30 || &error($text{'dnssec_eperiod30'});
 
 # Create or delete the cron job
 my $job = &get_dnssec_cron_job();

bind8/save_dnssectools.cgi

@@ -48,8 +48,10 @@ $in{'dt_zsklife'} =~ /(\b[0-9]+\b)/  ||
 	&error($text{'dt_conf_ezsklife'});
 $nv{'zsklife'} = $1;
 
-&save_dnssectools_directive($conf, \%nv);
+$in{'period'} =~ /^[1-9]\d*$/ || &error($text{'dnssec_eperiod'});
+$in{'period'} < 30 || &error($text{'dnssec_eperiod30'});
 
+&save_dnssectools_directive($conf, \%nv);
 
 &lock_file($module_config_file);
 $config{'dnssec_period'} = $in{'period'};

bind8/save_record.cgi

@@ -216,6 +216,13 @@ else {
 			$vals .= ".";
 			}
 		}
+	elsif ($in{'type'} eq "ALIAS") {
+		&valname($vals) ||
+			&error(&text('edit_ecname', $vals));
+		if ($vals =~ /\.\Q$in{'origin'}\E$/) {
+			$vals .= ".";
+			}
+		}
 	elsif ($in{'type'} eq "MX") {
 		&valname($in{'value1'}) ||
 			&error(&text('edit_emx', $in{'value1'}));

custom/custom-lib.pl

@@ -647,5 +647,4 @@ else {
 	}
 }
 
-
 1;

custom/help/cmd.html

@@ -1 +1,59 @@
-Jedes Kommando hat eine Beschreibung, die auf der Schaltfläche auf der Hauptseite angezeigt wird, sowie ein auszuführendes Kommando. Kommandos werden von <tt>sh</tt> ausgeführt und können daher Shell-Metazeichen wie <tt>|</tt>, <tt>&gt;</tt> und <tt>&amp;</tt> enthalten. Ebenso können Parameter wie <tt>$foo</tt> verwendet werden, die vor der Ausführung vom/von der Benutzer abgefragt werden.<p>Diese Parameter können in die untenstehende Tabelle eingetragen werden. Für jeden Parameter müssen folgende Angaben gemacht werden:<dl><dt><b>Name</b><dd>Ein eindeutiger Code für den Parameter. Wenn der Name <tt>foo</tt> lautet, wird <tt>$foo</tt> durch diese Eingabe ersetzt, wenn das Kommando ausgeführt wird.<p><dt><b>Beschreibung</b><dd>Diese Beschreibung wird neben den Parametern auf der Hauptseite angezeigt.<p><dt><b>Typ</b><dd>Diese Option bestimmt, wie der Parameter eingegeben wird. Mögliche Optionen sind:<ul><li><b>Text</b><br>Freie Texteingabe<li><b>Benutzer</b><br>Ein:e Benutzer Ihres Systems<li><b>UID</b><br>Die Benutzer-ID eines/einer Benutzer Ihres Systems<li><b>Gruppe</b><br>Ein Gruppenname Ihres Systems<li><b>GID</b><br>Die Gruppen-ID einer Gruppe Ihres Systems<li><b>Datei</b><br>Der vollständige Pfad zu einer Datei<li><b>Verzeichnis</b><br>Der vollständige Pfad zu einem Verzeichnis<li><b>Option</b><br>Eine Ja/Nein-Eingabe, die den Parameter auf den Wert setzt, der im Feld daneben eingetragen ist – aber nur, wenn <tt>JA</tt> ausgewählt wurde.<li><b>Passwort</b><br>Eine vollständig freie Texteingabe, wobei die Eingabe als „<tt>*</tt>“ maskiert wird.<li><b>Menü</b><br>Ein Dropdown-Menü mit Optionen, die aus der Datei entnommen werden, die im Feld daneben angegeben ist.</ul><p><dt><b>Parameter zitieren?</b><dd>Wenn <tt>Ja</tt> ausgewählt ist, werden die Parameter vor der Ausführung in Anführungszeichen (<tt>"</tt>) gesetzt. Dies ermöglicht die Verwendung von Parametern mit Leerzeichen.<p></dl><hr>
+Each command has a description (displayed on the button on the main page),
+and an actual command to execute. This command string can contain shell
+operators like |, &gt; and ; for executing multiple commands and pipelines.
+The string can also contain parameters like <tt>$foo</tt>, which are replaced
+by user inputs when the command is run. <p>
+
+These parameters can be entered into the table at the bottom of the page.
+For each parameter you must enter :
+<dl>
+<dt><b>Name</b>
+<dd>A unique code for this parameter. If the name is <tt>foo</tt>, then
+    <tt>$foo</tt> will be replaced by the parameter value when the command
+    is executed.<p>
+<dt><b>Description</b>
+<dd>The description next to this parameter on the main page.<p>
+<dt><b>Type</b>
+<dd>This option controls how the parameter is input. Available options are :
+	<ul>
+	<li><b>Text</b><br>
+	    A totally free-text input.
+	<li><b>User</b><br>
+	    A username from your system.
+	<li><b>UID</b><br>
+	    The UID of a user from your system.
+	<li><b>Group</b><br>
+	    A group name from your system.
+	<li><b>GID</b><br>
+	    The GID of a group from your system.
+	<li><b>File</b><br>
+	    The full path to a file.
+	<li><b>Directory</b><br>
+	    The full path to a directory.
+	<li><b>Option</b><br>
+	    A Yes/No input that will set the parameter to whatever is in
+	    the field next to the type input only if Yes is chosen.
+	<li><b>Password</b><br>
+	    A totally free-text input, but with the password replaced by *'s.
+	<li><b>Menu</b><br>
+	    A drop-down menu of options, taken from the filename entered into
+	    the text field to it. Or, instead of a filename you can enter a
+	    command with an | at the end, whose output will be used to determine
+	    the available options.
+	<li><b>Upload</b><br>
+	    An input box for selecting a file on the client side, which will be
+	    uploaded to the server when the command is run. This will be be
+	    placed in a temporary file, and the path to that file will be the
+	    value of this parameter when the command is run.
+	<li><b>Textbox</b><br>
+	    A multi-line free text field. When the command is run, any newline
+	    characters in the entered text will be converted into spaces.
+	</ul><p>
+    In most cases, the default value for the parameter will be whatever you
+    enter in the text box next to the parameter type menu.
+<dt><b>Quote parameter?</b>
+<dd>If Yes, the parameter will be quoted with " before substitution, allowing
+    the user to enter values containing whitespaces.<p>
+</dl>
+
+<hr>

dovecot/dovecot-lib.pl

@@ -4,9 +4,9 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
 
-@supported_auths = ( "anonymous", "plain", "digest-md5", "cram-md5", "apop",
-		     "scram-sha-1", "scram-sha-256", "ntlm", "gss-spnego",
-		     "gssapi", "rpa", "otp", "skey", "external",
+@supported_auths = ( "anonymous", "plain", "login", "digest-md5", "cram-md5",
+		     "apop", "scram-sha-1", "scram-sha-256", "ntlm",
+		     "gss-spnego", "gssapi", "rpa", "otp", "skey", "external",
 		     "oauthbearer", "xoauth2" );
 @mail_envs = ( undef, "maildir:~/Maildir", "mbox:~/mail/:INBOX=/var/mail/%u",
 	       "maildir:~/Maildir:mbox:~/mail/" );
@@ -555,6 +555,16 @@ return 0 if (!$ver);
 return &compare_version_numbers($ver, $wantver) >= 0;
 }
 
+# version_below(ver)
+# Returns 1 if running below some version
+sub version_below
+{
+local ($wantver) = @_;
+local $ver = &get_dovecot_version();
+return 0 if (!$ver);
+return &compare_version_numbers($ver, $wantver) < 0;
+}
+
 sub list_lock_methods
 {
 local ($forindex) = @_;

dovecot/edit_login.cgi

@@ -14,7 +14,11 @@ print &ui_table_row($text{'login_realms'},
 	    &ui_opt_textbox("realms", $realms, 40, $text{'login_none'}), 3);
 
 # Default authentication realm
-$realm = &find_value("auth_default_realm", $conf);
+$realm = &find_value(
+	&version_atleast("2.4")
+		? "auth_default_domain"
+		: "auth_default_realm",
+	$conf);
 print &ui_table_row($text{'login_realm'},
 	    &ui_opt_textbox("realm", $realm, 10, $text{'default'}));
 
@@ -87,25 +91,27 @@ elsif ($userdb =~ /^sql\s+(.*)/) {
 else {
 	$other = $userdb;
 	}
-print &ui_table_row($text{'login_userdb'},
-   &ui_radio("usermode", $usermode,
-	[ [ "passwd", $text{'login_passwd'}."<br>" ],
-	  [ "passwd-file", &text('login_passwdfile',
-		&ui_textbox("passwdfile", $passwdfile, 30))."<br>" ],
-	  [ "static", &text('login_static',
-		&ui_textbox("uid", $uid, 6),
-		&ui_textbox("gid", $gid, 6),
-		&ui_textbox("home", $home, 20))."<br>" ],
-	  [ "vpopmail", $text{'login_vpopmail'}."<br>" ],
-	  [ "ldap", &text('login_ldap',
-		&ui_textbox("ldap", $ldap, 30))."<br>" ],
-	  [ "pgsql", &text('login_pgsql',
-		&ui_textbox("pgsql", $pgsql, 30))."<br>" ],
-	  [ "sql", &text('login_sql',
-		&ui_textbox("sql", $sql, 30))."<br>" ],
-	  [ "", &text('login_other',
-		&ui_textbox("other", $other, 30))."<br>" ],
-	 ]), 3);
+if (&version_below("2.4")) {
+	print &ui_table_row($text{'login_userdb'},
+	&ui_radio("usermode", $usermode,
+		[ [ "passwd", $text{'login_passwd'}."<br>" ],
+		[ "passwd-file", &text('login_passwdfile',
+			&ui_textbox("passwdfile", $passwdfile, 30))."<br>" ],
+		[ "static", &text('login_static',
+			&ui_textbox("uid", $uid, 6),
+			&ui_textbox("gid", $gid, 6),
+			&ui_textbox("home", $home, 20))."<br>" ],
+		[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
+		[ "ldap", &text('login_ldap',
+			&ui_textbox("ldap", $ldap, 30))."<br>" ],
+		[ "pgsql", &text('login_pgsql',
+			&ui_textbox("pgsql", $pgsql, 30))."<br>" ],
+		[ "sql", &text('login_sql',
+			&ui_textbox("sql", $sql, 30))."<br>" ],
+		[ "", &text('login_other',
+			&ui_textbox("other", $other, 30))."<br>" ],
+		]), 3);
+	}
 
 # Password authentication system
 if (&find("auth_passdb", $conf, 2)) {
@@ -174,46 +180,49 @@ elsif ($passdb =~ /^checkpassword\s+(.*)$/) {
 else {
 	$pother = $passdb;
 	}
-print &ui_table_row($text{'login_passdb'},
-   &ui_radio("passmode", $passmode,
-	[ [ "passwd", $text{'login_passwd2'}."<br>" ],
-	  [ "shadow", $text{'login_shadow'}."<br>" ],
-	  [ "dpam", &text('login_dpam')."<br>" ],
-	  $alpha_opts ?
-	    ( [ "pam", &text('login_pam2',
-		  &ui_textbox("ppam", $ppam, 10),
-		  &ui_checkbox("ppam_session", 1,
-			       $text{'login_session'}, $psession),
-		  &ui_opt_textbox("ppam_ckey", $pckey, 10,
-				  $text{'login_none'}))."<br>" ]
- 	    ) :
-	    ( [ "pam", &text('login_pam',
-		  &ui_textbox("ppam", $ppam, 10))."<br>" ]
-	    ),
-	  [ "passwd-file", &text('login_passwdfile',
-		&ui_textbox("ppasswdfile", $ppasswdfile, 30))."<br>" ],
-	  [ "vpopmail", $text{'login_vpopmail'}."<br>" ],
-	  [ "ldap", &text('login_ldap',
-		&ui_textbox("pldap", $pldap, 30))."<br>" ],
-	  [ "pgsql", &text('login_pgsql',
-		&ui_textbox("ppgsql", $ppgsql, 30))."<br>" ],
-	  [ "sql", &text('login_sql',
-		&ui_textbox("psql", $psql, 30))."<br>" ],
-	  $alpha_opts ?
-	    ( [ "bsdauth",
-	        &text('login_bsdauth',
-		      &ui_opt_textbox("bsdauth_ckey", $pbckey, 10,
-				      $text{'login_none'}))."<br>" ],
-	      [ "checkpassword",
-	        &text('login_checkpassword',
-		 &ui_textbox("checkpassword", $checkpassword, 40))."<br>" ],
-	    ) :
-	    ( ),
-	  [ "", &text('login_other',
-		&ui_textbox("pother", $pother, 30))."<br>" ],
-	 ]), 3);
 
-print &ui_table_hr();
+if (&version_below("2.4")) {
+	print &ui_table_row($text{'login_passdb'},
+	&ui_radio("passmode", $passmode,
+		[ [ "passwd", $text{'login_passwd2'}."<br>" ],
+		[ "shadow", $text{'login_shadow'}."<br>" ],
+		[ "dpam", &text('login_dpam')."<br>" ],
+		$alpha_opts ?
+		( [ "pam", &text('login_pam2',
+			&ui_textbox("ppam", $ppam, 10),
+			&ui_checkbox("ppam_session", 1,
+				$text{'login_session'}, $psession),
+			&ui_opt_textbox("ppam_ckey", $pckey, 10,
+					$text{'login_none'}))."<br>" ]
+		) :
+		( [ "pam", &text('login_pam',
+			&ui_textbox("ppam", $ppam, 10))."<br>" ]
+		),
+		[ "passwd-file", &text('login_passwdfile',
+			&ui_textbox("ppasswdfile", $ppasswdfile, 30))."<br>" ],
+		[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
+		[ "ldap", &text('login_ldap',
+			&ui_textbox("pldap", $pldap, 30))."<br>" ],
+		[ "pgsql", &text('login_pgsql',
+			&ui_textbox("ppgsql", $ppgsql, 30))."<br>" ],
+		[ "sql", &text('login_sql',
+			&ui_textbox("psql", $psql, 30))."<br>" ],
+		$alpha_opts ?
+		( [ "bsdauth",
+			&text('login_bsdauth',
+			&ui_opt_textbox("bsdauth_ckey", $pbckey, 10,
+					$text{'login_none'}))."<br>" ],
+		[ "checkpassword",
+			&text('login_checkpassword',
+			&ui_textbox("checkpassword", $checkpassword, 40))."<br>" ],
+		) :
+		( ),
+		[ "", &text('login_other',
+			&ui_textbox("pother", $pother, 30))."<br>" ],
+		]), 3);
+
+	print &ui_table_hr();
+	}
 
 $fuid = &find_value("first_valid_uid", $conf);
 print &ui_table_row($text{'login_fuid'},
@@ -232,7 +241,11 @@ $lgid = &find_value("last_valid_gid", $conf);
 print &ui_table_row($text{'login_lgid'},
     &ui_opt_textbox("lgid", $lgid, 6, &getdef("last_valid_gid", \@mmap)));
 
-$extra = &find_value("mail_extra_groups", $conf);
+$extra = &find_value(&version_atleast("2")
+			? "mail_access_groups"
+			: "mail_extra_groups",
+		     $conf);
+
 print &ui_table_row($text{'login_extra'},
 	    &ui_opt_textbox("extra", $extra, 50, $text{'login_none'})."\n".
 	    &group_chooser_button("extra", 1), 3);

dovecot/edit_mail.cgi

@@ -13,25 +13,49 @@ $envmode = 4;
 if (&find("default_mail_env", $conf, 2)) {
 	$env = &find_value("default_mail_env", $conf);
 	}
+elsif (&find("mail_path", $conf, 2)) {
+	$env = &find_value("mail_path", $conf);
+	}
 else {
 	$env = &find_value("mail_location", $conf);
 	}
 if ($env =~ s/:INDEX=([^:]+)//) {
 	$index = $1;
 	}
+elsif (&find("mail_index_path", $conf, 2)) {
+	$index = &find_value("mail_index_path", $conf);
+	}
 if ($env =~ s/:CONTROL=([^:]+)//) {
 	$control = $1;
 	}
+elsif (&find("mail_control_path", $conf, 2)) {
+	$control = &find_value("mail_control_path", $conf);
+	}
 for($i=0; $i<@mail_envs; $i++) {
 	$envmode = $i if ($mail_envs[$i] eq $env);
 	}
 print &ui_table_row($text{'mail_env'},
 	&ui_radio("envmode", $envmode,
-		[ ( map { [ $_, $text{'mail_env'.$_}."<br>" ] } (0.. 3) ),
+		[ ( map { [ $_, $text{'mail_env'.$_}."<br>" ] } (
+			&version_atleast("2.4") ? (0) : (0 .. 3)) ),
 		  [ 4, &text('mail_env4',
 			&ui_textbox("other", $envmode == 4 ? $env : undef, 40)) ] ],
 		), 3);
 
+# Mail file format
+if (&version_atleast("2.4")) {
+	$driver = &find_value("mail_driver", $conf);
+	print &ui_table_row($text{'mail_driver'},
+		&ui_radio("driver", $driver,
+			   [ [ "", $text{'mail_driver_def'} ],
+			     [ "auto", $text{'mail_driver_auto'} ],
+			     [ "mbox", $text{'mail_driver_mbox'} ],
+			     [ "maildir", $text{'mail_driver_maildir'} ],
+			     [ "dbox", $text{'mail_driver_dbox'} ],
+			     [ "imapc", $text{'mail_driver_imapc'} ],
+			     [ "pop3c", $text{'mail_driver_auto'} ] ]));
+	}
+
 # Index files location
 $indexmode = $index eq 'MEMORY' ? 1 :
 	     $index ? 2 : 0;
@@ -89,26 +113,10 @@ print &ui_table_row($text{'mail_change'},
 	    [ "", &getdef($dirty, \@opts) ] ]), 3);
 
 # Permissions on files
-$umask = &find_value("umask", $conf);
-print &ui_table_row($text{'mail_umask'},
-	&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
-
-# UIDL format
-if (&find("pop3_uidl_format", $conf, 2)) {
-	$uidl = &find_value("pop3_uidl_format", $conf);
-	@opts = ( $uidl ? ( ) : ( [ "", $text{'mail_uidl_none'} ] ),
-		  [ "%v.%u", $text{'mail_uidl_dovecot'} ],
-		  [ "%08Xv%08Xu", $text{'mail_uidl_uw'} ],
-		  [ "%f", $text{'mail_uidl_courier0'} ],
-		  [ "%u", $text{'mail_uidl_courier1'} ],
-		  [ "%v-%u", $text{'mail_uidl_courier2'} ],
-		  [ "%Mf", $text{'mail_uidl_tpop3d'} ] );
-	($got) = grep { $_->[0] eq $uidl } @opts;
-	print &ui_table_row($text{'mail_uidl'},
-		&ui_select("pop3_uidl_format", $got ? $uidl : "*",
-			   [ @opts, [ "*", $text{'mail_uidl_other'} ] ])."\n".
-		&ui_textbox("pop3_uidl_format_other", $got ? "" : $uidl, 10),
-		3);
+if (&version_below("2")) {
+	$umask = &find_value("umask", $conf);
+	print &ui_table_row($text{'mail_umask'},
+		&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
 	}
 
 # Allow POP3 last command

dovecot/edit_ssl.cgi

@@ -9,7 +9,11 @@ print &ui_form_start("save_ssl.cgi", "post");
 print &ui_table_start($text{'ssl_header'}, "width=100%", 4);
 
 # SSL cert and key files
-if (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	$cert = &find_value('ssl_server_cert_file', $conf, 0, "");
+	$cert =~ s/^<//;
+	}
+elsif (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
 	$cert = &find_value("ssl_cert", $conf, 0, "");
 	$cert =~ s/^<//;
 	}
@@ -20,7 +24,11 @@ print &ui_table_row($text{'ssl_cert'},
 	    &ui_opt_textbox("cert", $cert, 40, &getdef("ssl_cert_file")), 3,
 	    [ undef, "nowrap" ]);
 
-if (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	$key = &find_value('ssl_server_key_file', $conf, 0, "");
+	$key =~ s/^<//;
+	}
+elsif (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
 	$key = &find_value("ssl_key", $conf, 0, "");
 	$key =~ s/^<//;
 	}
@@ -31,14 +39,12 @@ print &ui_table_row($text{'ssl_key'},
 	    &ui_opt_textbox("key", $key, 40, &getdef("ssl_key_file")), 3,
 	    [ undef, "nowrap" ]);
 
-# SSL key password
-$pass = &find_value("ssl_key_password", $conf);
-print &ui_table_row($text{'ssl_pass'},
-	    &ui_opt_textbox("pass", $pass, 20, $text{'ssl_prompt'}), 3,
-	    [ undef, "nowrap" ]);
-
 # SSL CA file
-if (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	$ca = &find_value('ssl_server_ca_file', $conf, 0, "");
+	$ca =~ s/^<//;
+	}
+elsif (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
 	$ca = &find_value("ssl_ca", $conf, 0, "");
 	$ca =~ s/^<//;
 	}
@@ -50,20 +56,41 @@ print &ui_table_row($text{'ssl_ca'},
 		&getdef("ssl_ca_file", [ [ "", $text{'ssl_none'} ] ])), 3,
 	    [ undef, "nowrap" ]);
 
+# SSL key password
+my $passdir = &version_atleast("2.4")
+	? "ssl_server_key_password"
+	: "ssl_key_password";
+$pass = &find_value($passdir, $conf);
+print &ui_table_row($text{'ssl_pass'},
+	    &ui_opt_textbox("pass", $pass, 20, $text{'ssl_prompt'}), 3,
+	    [ undef, "nowrap" ]);
+
 # Parameter regen time
-$regen = &find_value("ssl_parameters_regenerate", $conf);
-print &ui_table_row($text{'ssl_regen'},
-		    &ui_opt_textbox("regen", $regen, 5,
-				    &getdef("ssl_parameters_regenerate")).
-				    " ".$text{'ssl_hours'}, 3);
+if (&version_below("2.4")) {
+	$regen = &find_value("ssl_parameters_regenerate", $conf);
+	print &ui_table_row($text{'ssl_regen'},
+			&ui_opt_textbox("regen", $regen, 5,
+					&getdef("ssl_parameters_regenerate")).
+					" ".$text{'ssl_hours'}, 3);
+	}
 
 # Disable plaintext passwords when not SSL
-@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
-$plain = &find_value("disable_plaintext_auth", $conf);
-print &ui_table_row($text{'ssl_plain'},
-    &ui_radio("plain", $plain,
-	      [ @opts,
-		[ '', &getdef("disable_plaintext_auth", \@opts) ] ]), 3);
+if (&find_value("auth_allow_cleartext", $conf, 2)) {
+	@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
+	$plain = &find_value("auth_allow_cleartext", $conf);
+	print &ui_table_row($text{'ssl_plain2'},
+	    &ui_radio("plain", $plain,
+		      [ @opts,
+			[ '', "$text{'default'} (No)" ] ]), 3);
+	}
+else {
+	@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
+	$plain = &find_value("disable_plaintext_auth", $conf);
+	print &ui_table_row($text{'ssl_plain'},
+	    &ui_radio("plain", $plain,
+		      [ @opts,
+			[ '', &getdef("disable_plaintext_auth", \@opts) ] ]), 3);
+	}
 
 print &ui_table_end();
 print &ui_form_end([ [ "save", $text{'save'} ] ]);

dovecot/lang/en

@@ -56,6 +56,7 @@ ssl_regen=Interval between SSL parameter regeneration
 ssl_hours=hours
 ssl_none=None
 ssl_plain=Disallow plaintext authentication in non-SSL mode?
+ssl_plain2=Allow plaintext authentication in non-SSL mode?
 ssl_err=Failed to save SSL configuration
 ssl_ekey=Missing or non-existent private key file
 ssl_ecert=Missing or non-existent certificate file
@@ -134,6 +135,14 @@ mail_env1=Inbox and folders in <tt>~/Maildir</tt>
 mail_env2=Inbox under <tt>/var/mail</tt>, folders in <tt>~/mail</tt>
 mail_env3=Inbox in <tt>~/Maildir</tt>, folders in <tt>~/mail</tt>
 mail_env4=Other Dovecot location $1
+mail_driver=Mail file format
+mail_driver_def=Dovecot default
+mail_driver_auto=Detect automatically
+mail_driver_mbox=mbox (one file per folder)
+mail_driver_maildir=Maildir (one file per message)
+mail_driver_dbox=Dbox (Dovecot's custom format)
+mail_driver_imapc=Remote IMAP server
+mail_driver_pop3c=Remote POP3 server
 mail_index=Index files location
 mail_index0=Default (in Maildir directory)
 mail_index1=In memory only
@@ -152,16 +161,6 @@ mail_eenv=Missing or invalid-looking mail location
 mail_echeck=Missing or non-numeric number of seconds between checks
 mail_eidle=Missing or non-numeric number of seconds between checks when idle
 mail_eumask=Missing or invalid four-digit octal Umask
-mail_uidl=UIDL format
-mail_uidl_other=Other..
-mail_uidl_none=Not set (WARNING - Dove may not start)
-mail_uidl_dovecot=Old Dovecot, new Cyrus
-mail_uidl_uw=UW ipop3d
-mail_uidl_courier0=Courier version 0
-mail_uidl_courier1=Courier version 1, old Cyrus
-mail_uidl_courier2=Courier version 2
-mail_uidl_tpop3d=tpop3d
-mail_euidl=Missing or invalid UIDL format
 mail_last=Allow use of POP3 LAST command?
 mail_lock=Index files locking method
 mail_fcntl=fcntl function

dovecot/save_login.cgi

@@ -10,144 +10,151 @@ $conf = &get_config();
 # Allowed and default realm
 &save_directive($conf, "auth_realms",
 		$in{'realms_def'} ? undef : $in{'realms'});
-&save_directive($conf, "auth_default_realm",
+&save_directive($conf,
+		&version_atleast("2.4")
+			? "auth_default_domain"
+			: "auth_default_realm",
 		$in{'realm_def'} ? undef : $in{'realm'});
 
 # Authentication mechanisms
 if (&find("auth_mechanisms", $conf, 2)) {
 	&save_directive($conf, "auth_mechanisms",
-			join(" ", split(/\0/, $in{'mechs'})));
+			$in{'mechs'}
+				? join(" ", split(/\0/, $in{'mechs'}))
+				: undef);
 	}
 else {
 	&save_directive($conf, "mechanisms",
 			join(" ", split(/\0/, $in{'mechs'})), "auth","default");
 	}
 
-# User database
-$userdb = $in{'usermode'};
-if ($in{'usermode'} eq 'passwd-file') {
-	-r $in{'passwdfile'} || &error($text{'login_epasswdfile'});
-	$userdb .= " ".$in{'passwdfile'};
-	}
-elsif ($in{'usermode'} eq 'static') {
-	$in{'uid'} =~ /^\d+$/ || &error($text{'login_euid'});
-	$in{'gid'} =~ /^\d+$/ || &error($text{'login_egid'});
-	$in{'home'} || &error($text{'login_ehome'});
-	$userdb .= " uid=".$in{'uid'}." gid=".$in{'gid'}.
-		   " home=".$in{'home'};
-	}
-elsif ($in{'usermode'} eq 'ldap') {
-	-r $in{'ldap'} || &error($text{'login_eldap'});
-	$userdb .= " ".$in{'ldap'};
-	}
-elsif ($in{'usermode'} eq 'pgsql') {
-	-r $in{'pgsql'} || &error($text{'login_epgsql'});
-	$userdb .= " ".$in{'pgsql'};
-	}
-elsif ($in{'usermode'} eq 'sql') {
-	-r $in{'sql'} || &error($text{'login_esql'});
-	$userdb .= " ".$in{'sql'};
-	}
-elsif ($in{'usermode'} eq '') {
-	$userdb = $in{'other'};
-	}
-if ($usec = &find_section("userdb", $conf, undef, "auth", "default")) {
-	# Version 1.0.alpha format, which has a userdb *section*
-	($svalue, $args) = split(/\s+/, $userdb, 2);
-	$usec->{'value'} = $svalue;
-	$usec->{'members'} = [ grep { $_->{'name'} ne 'args' }
-				    @{$usec->{'members'}} ];
-	if ($args) {
-		$usec->{'members'} = [ { 'name' => 'args',
-					 'value' => $args } ];
+if (&version_below("2.4")) {
+	# User database
+	$userdb = $in{'usermode'};
+	if ($in{'usermode'} eq 'passwd-file') {
+		-r $in{'passwdfile'} || &error($text{'login_epasswdfile'});
+		$userdb .= " ".$in{'passwdfile'};
+		}
+	elsif ($in{'usermode'} eq 'static') {
+		$in{'uid'} =~ /^\d+$/ || &error($text{'login_euid'});
+		$in{'gid'} =~ /^\d+$/ || &error($text{'login_egid'});
+		$in{'home'} || &error($text{'login_ehome'});
+		$userdb .= " uid=".$in{'uid'}." gid=".$in{'gid'}.
+			" home=".$in{'home'};
+		}
+	elsif ($in{'usermode'} eq 'ldap') {
+		-r $in{'ldap'} || &error($text{'login_eldap'});
+		$userdb .= " ".$in{'ldap'};
+		}
+	elsif ($in{'usermode'} eq 'pgsql') {
+		-r $in{'pgsql'} || &error($text{'login_epgsql'});
+		$userdb .= " ".$in{'pgsql'};
+		}
+	elsif ($in{'usermode'} eq 'sql') {
+		-r $in{'sql'} || &error($text{'login_esql'});
+		$userdb .= " ".$in{'sql'};
+		}
+	elsif ($in{'usermode'} eq '') {
+		$userdb = $in{'other'};
+		}
+	if ($usec = &find_section("userdb", $conf, undef, "auth", "default")) {
+		# Version 1.0.alpha format, which has a userdb *section*
+		($svalue, $args) = split(/\s+/, $userdb, 2);
+		$usec->{'value'} = $svalue;
+		$usec->{'members'} = [ grep { $_->{'name'} ne 'args' }
+					@{$usec->{'members'}} ];
+		if ($args) {
+			$usec->{'members'} = [ { 'name' => 'args',
+						'value' => $args } ];
+			}
+		&save_section($conf, $usec);
+		}
+	elsif (&find("auth_userdb", $conf, 2)) {
+		# Version 0.99 format
+		&save_directive($conf, "auth_userdb", $userdb);
+		}
+	elsif (&find_value("driver", $conf, 2, "userdb")) {
+		# Version 2.0 format
+		$args = $userdb =~ s/\s+(\S.*)$// ? $1 : undef;
+		&save_directive($conf, "driver", $userdb, "userdb");
+		&save_directive($conf, "args", $args, "userdb");
+		}
+	else {
+		# Version 1.0 format
+		&save_directive($conf, "userdb", $userdb, "auth", "default");
 		}
-	&save_section($conf, $usec);
-	}
-elsif (&find("auth_userdb", $conf, 2)) {
-	# Version 0.99 format
-	&save_directive($conf, "auth_userdb", $userdb);
-	}
-elsif (&find_value("driver", $conf, 2, "userdb")) {
-	# Version 2.0 format
-	$args = $userdb =~ s/\s+(\S.*)$// ? $1 : undef;
-	&save_directive($conf, "driver", $userdb, "userdb");
-	&save_directive($conf, "args", $args, "userdb");
-	}
-else {
-	# Version 1.0 format
-	&save_directive($conf, "userdb", $userdb, "auth", "default");
-	}
 
-# Password mode
-$passdb = $in{'passmode'};
-if ($in{'passmode'} eq 'dpam') {
-	$passdb = "pam";
-	}
-elsif ($in{'passmode'} eq 'pam') {
-	$in{'ppam'} =~ /^\S+$/ || &error($text{'login_edpam'});
-	if (defined($in{'ppam_ckey'}) && !$in{'ppam_ckey_def'}) {
-		$ckey = $in{'ppam_ckey'};
-		$ckey =~ /^\S+$/ || &error($text{'login_eckey'});
+	# Password mode
+	$passdb = $in{'passmode'};
+	if ($in{'passmode'} eq 'dpam') {
+		$passdb = "pam";
 		}
-	$passdb .= ($in{'ppam_session'} ? " -session" : "").
-		   ($ckey ? " cache_key=$ckey" : "").
-		   " ".$in{'ppam'};
-	}
-elsif ($in{'passmode'} eq 'passwd-file') {
-	-r $in{'ppasswdfile'} || &error($text{'login_epasswdfile'});
-	$passdb .= " ".$in{'ppasswdfile'};
-	}
-elsif ($in{'passmode'} eq 'ldap') {
-	-r $in{'pldap'} || &error($text{'login_eldap'});
-	$passdb .= " ".$in{'pldap'};
-	}
-elsif ($in{'passmode'} eq 'pgsql') {
-	-r $in{'ppgsql'} || &error($text{'login_epgsql'});
-	$passdb .= " ".$in{'ppgsql'};
-	}
-elsif ($in{'passmode'} eq 'sql') {
-	-r $in{'psql'} || &error($text{'login_esql'});
-	$passdb .= " ".$in{'psql'};
-	}
-elsif ($in{'passmode'} eq 'bsdauth') {
-	$in{'bsdauth_ckey_def'} || $in{'bsdauth_ckey'} =~ /^\S+$/ ||
-		&error($text{'login_eckey'});
-	$passdb .= " cache_key=$in{'bsdauth_ckey'}"
-		if (!$in{'bsdauth_ckey_def'});
-	}
-elsif ($in{'passmode'} eq 'checkpassword') {
-	-x $in{'checkpassword'} || &error($text{'login_echeckpassword'});
-	$passdb .= " ".$in{'checkpassword'};
-	}
-elsif ($in{'passmode'} eq '') {
-	$passdb = $in{'other'};
-	}
-# XXX other modes
-if ($psec = &find_section("passdb", $conf, undef, "auth", "default")) {
-	# Version 1.0.alpha format
-	($svalue, $args) = split(/\s+/, $passdb, 2);
-	$psec->{'value'} = $svalue;
-	$psec->{'members'} = [ grep { $_->{'name'} ne 'args' }
-				    @{$psec->{'members'}} ];
-	if ($args) {
-		$psec->{'members'} = [ { 'name' => 'args',
-					 'value' => $args } ];
+	elsif ($in{'passmode'} eq 'pam') {
+		$in{'ppam'} =~ /^\S+$/ || &error($text{'login_edpam'});
+		if (defined($in{'ppam_ckey'}) && !$in{'ppam_ckey_def'}) {
+			$ckey = $in{'ppam_ckey'};
+			$ckey =~ /^\S+$/ || &error($text{'login_eckey'});
+			}
+		$passdb .= ($in{'ppam_session'} ? " -session" : "").
+			($ckey ? " cache_key=$ckey" : "").
+			" ".$in{'ppam'};
+		}
+	elsif ($in{'passmode'} eq 'passwd-file') {
+		-r $in{'ppasswdfile'} || &error($text{'login_epasswdfile'});
+		$passdb .= " ".$in{'ppasswdfile'};
+		}
+	elsif ($in{'passmode'} eq 'ldap') {
+		-r $in{'pldap'} || &error($text{'login_eldap'});
+		$passdb .= " ".$in{'pldap'};
+		}
+	elsif ($in{'passmode'} eq 'pgsql') {
+		-r $in{'ppgsql'} || &error($text{'login_epgsql'});
+		$passdb .= " ".$in{'ppgsql'};
+		}
+	elsif ($in{'passmode'} eq 'sql') {
+		-r $in{'psql'} || &error($text{'login_esql'});
+		$passdb .= " ".$in{'psql'};
+		}
+	elsif ($in{'passmode'} eq 'bsdauth') {
+		$in{'bsdauth_ckey_def'} || $in{'bsdauth_ckey'} =~ /^\S+$/ ||
+			&error($text{'login_eckey'});
+		$passdb .= " cache_key=$in{'bsdauth_ckey'}"
+			if (!$in{'bsdauth_ckey_def'});
+		}
+	elsif ($in{'passmode'} eq 'checkpassword') {
+		-x $in{'checkpassword'} || &error($text{'login_echeckpassword'});
+		$passdb .= " ".$in{'checkpassword'};
+		}
+	elsif ($in{'passmode'} eq '') {
+		$passdb = $in{'other'};
+		}
+	# XXX other modes
+	if ($psec = &find_section("passdb", $conf, undef, "auth", "default")) {
+		# Version 1.0.alpha format
+		($svalue, $args) = split(/\s+/, $passdb, 2);
+		$psec->{'value'} = $svalue;
+		$psec->{'members'} = [ grep { $_->{'name'} ne 'args' }
+					@{$psec->{'members'}} ];
+		if ($args) {
+			$psec->{'members'} = [ { 'name' => 'args',
+						'value' => $args } ];
+			}
+		&save_section($conf, $psec);
+		}
+	elsif (&find("auth_passdb", $conf, 2)) {
+		# Version 0.99 format
+		&save_directive($conf, "auth_passdb", $passdb);
+		}
+	elsif (&find_value("driver", $conf, 2, "passdb")) {
+		# Version 2.0 format
+		$args = $passdb =~ s/\s+(\S.*)$// ? $1 : undef;
+		&save_directive($conf, "driver", $passdb, "passdb");
+		&save_directive($conf, "args", $args, "passdb");
+		}
+	else {
+		# Version 1.0 format
+		&save_directive($conf, "passdb", $passdb, "auth", "default");
 		}
-	&save_section($conf, $psec);
-	}
-elsif (&find("auth_passdb", $conf, 2)) {
-	# Version 0.99 format
-	&save_directive($conf, "auth_passdb", $passdb);
-	}
-elsif (&find_value("driver", $conf, 2, "passdb")) {
-	# Version 2.0 format
-	$args = $passdb =~ s/\s+(\S.*)$// ? $1 : undef;
-	&save_directive($conf, "driver", $passdb, "passdb");
-	&save_directive($conf, "args", $args, "passdb");
-	}
-else {
-	# Version 1.0 format
-	&save_directive($conf, "passdb", $passdb, "auth", "default");
 	}
 
 # Allowed UIDs and GIDs
@@ -167,7 +174,10 @@ $in{'lgid_def'} || $in{'lgid'} =~ /^\d+$/ || &error($text{'login_elgid'});
 &save_directive($conf, "last_valid_gid",
 		$in{'lgid_def'} ? undef : $in{'lgid'});
 
-&save_directive($conf, "mail_extra_groups",
+&save_directive($conf,
+		&version_atleast("2")
+			? "mail_access_groups"
+			: "mail_extra_groups",
 		$in{'extra_def'} ? undef : $in{'extra'});
 
 $in{'chroot_def'} || -d $in{'chroot'} || &error($text{'login_echroot'});

dovecot/save_mail.cgi

@@ -17,27 +17,59 @@ else {
 	}
 
 # Add index file location
-$env || !$in{'indexmode'} || &error($text{'mail_eindexmode'});
-$env || !$in{'controlmode'} || &error($text{'mail_econtrolmode'});
-if ($in{'indexmode'} == 1) {
-	$env .= ":INDEX=MEMORY";
+if (&version_below("2.4")) {
+	$env || !$in{'indexmode'} || &error($text{'mail_eindexmode'});
+	$env || !$in{'controlmode'} || &error($text{'mail_econtrolmode'});
+	if ($in{'indexmode'} == 1) {
+		$env .= ":INDEX=MEMORY";
+		}
+	elsif ($in{'indexmode'} == 2) {
+		$in{'index'} =~ /^\/\S+$/ || &error($text{'mail_eindex'});
+		$env .= ":INDEX=".$in{'index'};
+		}
+	if ($in{'controlmode'}) {
+		$in{'control'} =~ /^\/\S+$/ || &error($text{'mail_econtrol'});
+		$env .= ":CONTROL=".$in{'control'};
+		}
 	}
-elsif ($in{'indexmode'} == 2) {
-	$in{'index'} =~ /^\/\S+$/ || &error($text{'mail_eindex'});
-	$env .= ":INDEX=".$in{'index'};
-	}
-if ($in{'controlmode'}) {
-	$in{'control'} =~ /^\/\S+$/ || &error($text{'mail_econtrol'});
-	$env .= ":CONTROL=".$in{'control'};
+else {
+	# Parse index and control first
+	if ($in{'indexmode'} == 1) {
+		$index = "MEMORY";
+		}
+	elsif ($in{'indexmode'} == 2) {
+		$in{'index'} =~ /^\/\S+$/ || $in{'index'} =~ /^~\S+$/ ||
+			&error($text{'mail_eindex'});
+		$index = $in{'index'};
+		}
+	if ($in{'controlmode'}) {
+		$in{'control'} =~ /^\/\S+$/ || $in{'control'} =~ /^~\S+$/ ||
+			&error($text{'mail_econtrol'});
+		$control = $in{'control'};
+		}
+	# Directly save dedicated mail_index_path and mail_control_path
+	&save_directive($conf, "mail_index_path",
+		$index eq "" ? undef : $index);
+	&save_directive($conf, "mail_control_path",
+		$control eq "" ? undef : $control);
 	}
 
 if (&find("default_mail_env", $conf, 2)) {
 	&save_directive($conf, "default_mail_env", $env eq "" ? undef : $env);
 	}
+elsif (&find("mail_path", $conf, 2)) {
+	&save_directive($conf, "mail_path", $env eq "" ? undef : $env);
+	}
 else {
 	&save_directive($conf, "mail_location", $env eq "" ? undef : $env);
 	}
 
+# Mail file format
+if (&version_atleast("2.4")) {
+	my $driver = $in{'driver'};
+	&save_directive($conf, "mail_driver", $driver eq "" ? undef : $driver);
+	}
+
 # Idle intervals
 $in{'idle'} != 2 || $in{'idlei'} =~ /^\d+$/ || &error($text{'mail_eidle'});
 &save_directive($conf, "mailbox_idle_check_interval",
@@ -57,17 +89,12 @@ else {
 			$in{'change'} ? $in{'change'} : undef);
 	}
 
-# Umask
-$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||&error($text{'mail_eumask'});
-&save_directive($conf, "umask",
-		$in{'umask_def'} ? undef : $in{'umask'});
-
-# UIDL format
-if (&find("pop3_uidl_format", $conf, 2)) {
-	$uidl = $in{'pop3_uidl_format'} eq '*' ?
-			$in{'pop3_uidl_format_other'} : $in{'pop3_uidl_format'};
-	$uidl =~ /^\S+$/ || &error($text{'mail_euidl'});
-	&save_directive($conf, "pop3_uidl_format", $uidl);
+if (&version_below("2")) {
+	# Umask
+	$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||
+		&error($text{'mail_eumask'});
+	&save_directive($conf, "umask",
+			$in{'umask_def'} ? undef : $in{'umask'});
 	}
 
 # LAST command

dovecot/save_ssl.cgi

@@ -7,10 +7,14 @@ require './dovecot-lib.pl';
 $conf = &get_config();
 &lock_dovecot_files($conf);
 
-# Save SSL cert and key
+# Save SSL cert
 $in{'cert_def'} || -r $in{'cert'} || $in{'cert'} =~ /^[<>\|]/ ||
 	&error($text{'ssl_ecert'});
-if (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	&save_directive($conf, "ssl_server_cert_file",
+		        $in{'cert_def'} ? undef : $in{'cert'}, "");
+	}
+elsif (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
 	$in{'cert'} = "<".$in{'cert'} if ($in{'cert'} =~ /^\//);
 	&save_directive($conf, "ssl_cert",
 		        $in{'cert_def'} ? undef : $in{'cert'}, "");
@@ -20,9 +24,14 @@ else {
 		        $in{'cert_def'} ? undef : $in{'cert'});
 	}
 
+# Save SSL key
 $in{'key_def'} || -r $in{'key'} || $in{'key'} =~ /^[<>\|]/ ||
 	&error($text{'ssl_ekey'});
-if (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	&save_directive($conf, "ssl_server_key_file",
+		        $in{'key_def'} ? undef : $in{'key'}, "");
+	}
+elsif (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
 	$in{'key'} = "<".$in{'key'} if ($in{'key'} =~ /^\//);
 	&save_directive($conf, "ssl_key",
 		        $in{'key_def'} ? undef : $in{'key'}, "");
@@ -35,7 +44,11 @@ else {
 # Save SSL CA cert
 $in{'ca_def'} || -r $in{'ca'} || $in{'ca'} =~ /^[<>\|]/ ||
 	&error($text{'ssl_eca'});
-if (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
+if (&version_atleast("2.4")) {
+	&save_directive($conf, "ssl_server_ca_file",
+		        $in{'ca_def'} ? undef : $in{'ca'}, "");
+	}
+elsif (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
 	$in{'ca'} = "<".$in{'ca'} if ($in{'ca'} =~ /^\//);
 	&save_directive($conf, "ssl_ca",
 		        $in{'ca_def'} ? undef : $in{'ca'}, "");
@@ -47,15 +60,29 @@ else {
 
 # Save SSL key password
 $in{'pass_def'} || $in{'pass'} =~ /\S/ || &error($text{'ssl_epass'});
-&save_directive($conf, "ssl_key_password",
-		$in{'pass_def'} ? undef : $in{'pass'});
+&save_directive($conf,
+	&version_atleast("2.4")
+		? "ssl_server_key_password"
+		: "ssl_key_password",
+	$in{'pass_def'} ? undef : $in{'pass'});
 
-$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ || &error($text{'ssl_eregen'});
-&save_directive($conf, "ssl_parameters_regenerate",
-		$in{'regen_def'} ? undef : $in{'regen'});
+# Save SSL parameter regeneration time
+if (&version_below("2.4")) {
+	$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ ||
+		&error($text{'ssl_eregen'});
+	&save_directive($conf, "ssl_parameters_regenerate",
+			$in{'regen_def'} ? undef : $in{'regen'});
+	}
 
-&save_directive($conf, "disable_plaintext_auth",
-		$in{'plain'} ? $in{'plain'} : undef);
+# Save plaintext password setting
+if (&find_value("auth_allow_cleartext", $conf, 2)) {
+	&save_directive($conf, "auth_allow_cleartext",
+			$in{'plain'} ? $in{'plain'} : undef);
+	}
+else {
+	&save_directive($conf, "disable_plaintext_auth",
+			$in{'plain'} ? $in{'plain'} : undef);
+	}
 
 &flush_file_lines();
 &unlock_dovecot_files($conf);

forgot.cgi

@@ -14,6 +14,12 @@ $trust_unknown_referers = 1;
 $gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
 my $timeout = $gconfig{'passreset_timeout'} || 15;
 $remote_user && &error($text{'forgot_elogin'});
+$ENV{'HTTPS'} eq 'ON' || $gconfig{'forgot_pass'} == 2 ||
+        &error($text{'forgot_essl'});
+$ENV{'SSL_CN_CERT'} == 1 ||
+	&error(&text('forgot_esslhost',
+		     &html_escape($ENV{'HTTP_HOST'} || $ENV{'SSL_CN'})))
+			if ($ENV{'HTTPS'} eq 'ON');
 
 # Check that the random ID is valid
 $in{'id'} =~ /^[a-f0-9]+$/i || &error($text{'forgot_eid'});
@@ -23,6 +29,12 @@ my $linkfile = $main::forgot_password_link_dir."/".$in{'id'};
 time() - $link{'time'} > 60*$timeout &&
 	&error(&text('forgot_etime', $timeout));
 
+# Check that the hostname in the original email matches the current hostname
+my ($basehost) = &parse_http_url(&get_webmin_email_url());
+if ($basehost ne $link{'host'}) {
+	&error($text{'forgot_ehost'});
+	}
+
 # Get the Webmin user
 &foreign_require("acl");
 my ($wuser) = grep { $_->{'name'} eq $link{'user'} } &acl::list_users();

forgot_form.cgi

@@ -13,9 +13,16 @@ $trust_unknown_referers = 1;
 &error_setup($text{'forgot_err'});
 $gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
 $remote_user && &error($text{'forgot_elogin'});
+$ENV{'HTTPS'} eq 'ON' || $gconfig{'forgot_pass'} == 2 ||
+        &error($text{'forgot_essl'});
+$ENV{'SSL_CN_CERT'} == 1 ||
+	&error(&text('forgot_esslhost',
+ 		     &html_escape($ENV{'HTTP_HOST'} || $ENV{'SSL_CN'})))
+		     	if ($ENV{'HTTPS'} eq 'ON');
 
 &ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);
-
+print &ui_alert_box("<b> ⚠ ".$text{'forgot_nossl_warn'}, 'warn')
+        if ($gconfig{'forgot_pass'} == 2 && $ENV{'HTTPS'} ne 'ON');
 print "<center>\n";
 print $text{'forgot_desc'},"<p>\n";
 print &ui_form_start("forgot_send.cgi", "post");

forgot_send.cgi

@@ -12,6 +12,12 @@ $no_acl_check++;
 &error_setup($text{'forgot_err'});
 $gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
 $remote_user && &error($text{'forgot_elogin'});
+$ENV{'HTTPS'} eq 'ON' || $gconfig{'forgot_pass'} == 2 ||
+        &error($text{'forgot_essl'});
+$ENV{'SSL_CN_CERT'} == 1 ||
+	&error(&text('forgot_esslhost',
+ 		     &html_escape($ENV{'HTTP_HOST'} || $ENV{'SSL_CN'})))
+		     	if ($ENV{'HTTPS'} eq 'ON');
 
 # Lookup the Webmin user
 &foreign_require("acl");
@@ -103,8 +109,11 @@ sleep($maxtries);
 $wuser->{'pass'} eq '*LK*' && &error($text{'forgot_elock'});
 
 # Generate a random ID and tracking file for this password reset
+my $baseurl = &get_webmin_email_url();
+my ($basehost) = &parse_http_url($baseurl);
 my %link = ( 'id' => &acl::generate_random_id(),
 	     'remote' => $ENV{'REMOTE_ADDR'},
+	     'host' => $basehost,
 	     'time' => $now,
 	     'user' => $wuser->{'name'},
 	     'uuser' => $uuser ? $uuser->{'user'} : undef,
@@ -114,7 +123,6 @@ my $linkfile = $main::forgot_password_link_dir."/".$link{'id'};
 &lock_file($linkfile);
 &write_file($linkfile, \%link);
 &unlock_file($linkfile);
-my $baseurl = &get_webmin_email_url();
 my $url = $baseurl.'/forgot.cgi?id='.&urlize($link{'id'});
 my $username = $muser ? $muser->{'user'} :
 	       $uuser ? $uuser->{'user'} : $wuser->{'name'};

gray-theme/unauthenticated/gray-theme.css

@@ -891,3 +891,15 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin {
   field-sizing: content !important;
   min-width: 40px !important;
 }
+.text-danger {
+  color: #bc0303;
+}
+.text-success {
+  color: #3c763d;
+}
+.text-warning {
+  color: #b58900;
+}
+.text-info {
+  color: #108eda;
+}

lang/en

@@ -159,6 +159,7 @@ forgot_erandom=Failed to generate random ID!
 forgot_eid=Missing or invalid-looking reset ID!
 forgot_eid2=Reset ID is not valid!
 forgot_etime=Password reset email is more than $1 minutes old.
+forgot_ehost=Hostname mismatch in reset email
 forgot_newpass=New password for user $1
 forgot_newpass2=New password again
 forgot_passok=Change Password
@@ -182,6 +183,10 @@ forgot_eunixlock=User user's password is locked!
 forgot_elogin=Forgotten password pages cannot be used when you are already logged in to Webmin!
 forgot_erate=Too many password reset attempts for $1! Please try again later.
 forgot_eremote=Webmin server on this system is not running or is not configured to allow forgotten password recovery.
+forgot_essl=Forgotten password recovery can only be used over an SSL connection unless explicitly allowed
+forgot_nossl=Yes, and allow over insecure connection
+forgot_esslhost=Forgotten password recovery cannot be used with invalid SSL hostname $1
+forgot_nossl_warn=Warning: This password reset is being sent over an insecure, not-encrypted connection and is vulnerable to man-in-the-middle (MITM) and header-injection attacks.
 
 pam_header=Login to Webmin
 pam_mesg=You must respond to the question below to login to Webmin server on $1.
@@ -438,6 +443,37 @@ file_truncated_message=fetched $1 of data, truncated $2 out of $3
 file_truncated_message_head=fetched beginning $1 of data, truncated $2 out of $3
 file_truncated_message_tail=fetched ending $1 of data, truncated $2 out of $3
 
+time_ago_col=Time ago
+time_ago_year=$1 year ago
+time_ago_years=$1 years ago
+time_ago_month=$1 month ago
+time_ago_months=$1 months ago
+time_ago_week=$1 week ago
+time_ago_weeks=$1 weeks ago
+time_ago_day=$1 day ago
+time_ago_days=$1 days ago
+time_ago_hour=$1 hour ago
+time_ago_hours=$1 hours ago
+time_ago_min=$1 minute ago
+time_ago_mins=$1 minutes ago
+time_ago_sec=$1 second ago
+time_ago_secs=$1 seconds ago
+time_in_year=In $1 year
+time_in_years=In $1 years
+time_in_month=In $1 month
+time_in_months=In $1 months
+time_in_week=In $1 week
+time_in_weeks=In $1 weeks
+time_in_day=In $1 day
+time_in_days=In $1 days
+time_in_hour=In $1 hour
+time_in_hours=In $1 hours
+time_in_min=In $1 minute
+time_in_mins=In $1 minutes
+time_in_sec=In $1 second
+time_in_secs=In $1 seconds
+time_now=Just now
+
 defcert_error=Default $1 bundled SSL certificate is being used. It is highly advised to update default <tt>$2</tt> certificate before proceeding with login.
 
 main_error_details=Error details

logviewer/lang/en

@@ -20,6 +20,7 @@ journal_journalctl_unit=Messages for specific unit
 journal_since0=Latest available
 journal_since1=Real-time follow
 journal_since2=Current boot
+journal_since2-1=Last boot
 journal_since3=7 days ago
 journal_since4=24 hours ago
 journal_since5=8 hours ago