Fix not to double encode on modify

This reverts commit 45845b8ca6.

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+#### 2.104 (October 12, 2023)
+* Add support for numbered and bulleted lists in mail HTML editor
+* Fix Webmin version display [#2023](https://github.com/webmin/webmin/issues/2023)
+* Fix hostname detection on `systemd` systems to avoid excessive logging  [#2020](https://github.com/webmin/webmin/issues/2020)
+* Fix to check if UI library is loaded before using it [#2021](https://github.com/webmin/webmin/issues/2021)
+
+#### 2.103 (October 08, 2023)
+* Add support for hostname detection using `hostnamectl` command
+* Add support for other ACME services
+* Add ability to hide dotfiles in File Manager [#1578](https://github.com/webmin/authentic-theme/issues/1578)
+* Add `xz`, `zstd` and plain `tar` support when creating archives in File Manager [#2009](https://github.com/webmin/webmin/issues/2009)
+* Add support for English (United States) (military time) locale
+* Fix to correctly switch key hash type with ACME services
+* Fix bug when `backend` wasn't saved correctly in Fail2Ban module [#1992](https://github.com/webmin/webmin/issues/1992)
+* Fix large files download in Upload and Download module
+* Fix Google Authentication on RHEL systems derivatives
+* Update the Authentic theme to the latest version with various fixes and improvements
+
 #### 2.102 (August 23, 2023)
 * Add support for Amazon Linux 2023
 * Fix a bug in Network Configuration module when parsing network size [sourceforge.net/discussion#55377]( https://sourceforge.net/p/webadmin/discussion/55377/thread/78e5aa05f3)

bind8/bind8-lib.pl

@@ -1976,22 +1976,32 @@ if (!$file) {
 push(@{$dir->{'members'}}, { 'name' => 'file',
 			     'values' => [ $file ] } );
 
-# Add slave IPs
+# Allow transfer from slave IPs
-if (@$slaves) {
+my (@notify, @transfer);
+foreach my $s (@$slaves) {
+	push(@notify, { 'name' => $s });
+	push(@transfer, { 'name' => $s });
+	}
+if (@transfer) {
+	my $gat = &find("allow-transfer", $opts->{'members'});
+	if ($gat) {
+		push(@transfer, @{$gat->{'members'}});
+		}
+	}
+if (@notify) {
 	my $also = { 'name' => 'also-notify',
 		     'type' => 1,
-		     'members' => [ ] };
+		     'members' => \@notify};
-	my $allow = { 'name' => 'allow-transfer',
+	push(@{$dir->{'members'}}, $also);
-		      'type' => 1,
-		      'members' => [ ] };
-	foreach my $s (@$slaves) {
-		push(@{$also->{'members'}}, { 'name' => $s });
-		push(@{$allow->{'members'}}, { 'name' => $s });
-		}
-	push(@{$dir->{'members'}}, $also, $allow);
 	push(@{$dir->{'members'}}, { 'name' => 'notify',
 				     'values' => [ 'yes' ] });
 	}
+if (@transfer) {
+	my $allow = { 'name' => 'allow-transfer',
+		      'type' => 1,
+		      'members' => \@transfer };
+	push(@{$dir->{'members'}}, $allow);
+	}
 
 # Create the zone file, with records
 my $ZONE;

bind8/conf_trusted.cgi

@@ -5,7 +5,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 # Globals
-our (%access, %text);
+our (%access, %text, $bind_version);
 our $dnssec_dlv_zone;
 
 require './bind8-lib.pl';
@@ -24,10 +24,12 @@ $tkeys ||= { 'members' => [ ] };
 print &ui_form_start("save_trusted.cgi", "post");
 print &ui_table_start($text{'trusted_header'}, undef, 2);
 
-# DNSSEC enabled?
+if (&compare_version_numbers($bind_version, '<', '9.16.0')) {
-print &choice_input($text{'trusted_dnssec'}, 'dnssec-enable', $mems,
+	# DNSSEC enabled?
-		    $text{'yes'}, 'yes', $text{'no'}, 'no',
+	print &choice_input($text{'trusted_dnssec'}, 'dnssec-enable', $mems,
-		    $text{'default'}, undef);
+			    $text{'yes'}, 'yes', $text{'no'}, 'no',
+			    $text{'default'}, undef);
+	}
 if (&supports_dnssec_client() == 2) {
 	print &choice_input($text{'trusted_validation'},
 			    'dnssec-validation', $mems,

bind8/save_trusted.cgi

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-our (%access, %text, %in, %config);
+our (%access, %text, %in, %config, $bind_version);
 
 require './bind8-lib.pl';
 $access{'defaults'} || &error($text{'trusted_ecannot'});
@@ -17,7 +17,9 @@ my $conf = $parent->{'members'};
 my $options = &find("options", $conf);
 
 # DNSSEC enabled
-&save_choice("dnssec-enable", $options, 1);
+if (&compare_version_numbers($bind_version, '<', '9.16.0')) {
+	&save_choice("dnssec-enable", $options, 1);
+	}
 if (&supports_dnssec_client() == 2) {
 	&save_choice("dnssec-validation", $options, 1);
 	}

create-module.pl

@@ -19,6 +19,10 @@ while(@ARGV) {
 		shift(@ARGV);
 		$createsig = 1;
 		}
+	elsif ($ARGV[0] eq "--key") {
+		shift(@ARGV);
+		$keyname = shift(@ARGV);
+		}
 	elsif ($ARGV[0] eq "--exclude") {
 		shift(@ARGV);
 		push(@exclude, shift(@ARGV));
@@ -98,7 +102,8 @@ if ($file =~ /^(.*)\.gz$/i) {
 	}
 if ($createsig) {
 	system("rm -f $file-sig.asc");
-	system("gpg --armor --output $file-sig.asc --detach-sig $file");
+	system("gpg ".($keyname ? " --default-key $keyname" : "").
+	       " --armor --output $file-sig.asc --detach-sig $file");
 	}
 
 # read_file(file, &assoc, [&order], [lowercase])

dovecot/dovecot-lib.pl

@@ -216,6 +216,11 @@ return wantarray ? @rv : $rv[0];
 sub save_directive
 {
 local ($conf, $name, $value, $sname, $svalue) = @_;
+$newconf = [ grep { $_->{'file'} !~ /^\/usr\/share\/dovecot/ &&
+                    $_->{'file'} !~ /^\/opt/ } @$conf ];
+if (@$newconf) {
+	$conf = $newconf;
+	}
 local $dir;
 if (ref($name)) {
 	# Old directive given
@@ -577,5 +582,4 @@ else {
 }
 
 1;
-r
 

exports/config.info

@@ -1,4 +1,3 @@
-line2=System configuration,11
 exports_file=Exported filesystems file,0
 apply_cmd=Command to apply configuration,3,None
 restart_command=Command to restart export server,0

fail2ban/edit_jaildef.cgi

@@ -51,9 +51,11 @@ print &ui_table_row($text{'jail_ignoreip'},
 my $backend = &find_value("backend", $jail);
 print &ui_table_row($text{'jail_backend'},
 	&ui_select("backend", $backend || "auto",
-		   [ [ "auto", $text{'jail_auto'} ],
+			[ [ "auto", $text{'jail_auto'} ],
-		     [ "gamin", $text{'jail_gamin'} ],
+			  [ "systemd", $text{'jail_systemd'} ],
-		     [ "polling", $text{'jail_polling'} ] ]));
+			  [ "polling", $text{'jail_polling'} ],
+			  [ "gamin", $text{'jail_gamin'} ],
+			  [ "pyinotify", $text{'jail_pyinotify'} ] ]));
 
 # Email destination
 my $destemail = &find_value("destemail", $jail);

fail2ban/lang/en

@@ -114,8 +114,10 @@ jail_efindtime=Delay between matches must be a number greater than zero
 jail_ebantime=Time to ban an IP must be a number greater than zero
 jail_backend=Check for log file updates using
 jail_auto=Decide automatically
-jail_gamin=Gamin file alteration monitor
+jail_systemd=systemd
-jail_polling=Background polling
+jail_polling=polling
+jail_gamin=gamin
+jail_pyinotify=pyinotify
 jail_destemail=Default notification email
 jail_none=None set
 jail_banaction=Default action to apply

filemin/compress.cgi

@@ -11,7 +11,19 @@ if(!$in{'arch'}) {
 
 my $command;
 
-if ($in{'method'} eq 'tar') {
+if ($in{'method'} eq 'plain-tar') {
+	$full = "$cwd/$in{'arch'}.tar";
+	$command = "tar cf ".quotemeta($full)." -C ".quotemeta($cwd);
+	}
+elsif ($in{'method'} eq 'xz-tar') {
+	$full = "$cwd/$in{'arch'}.tar.xz";
+	$command = "tar cJf ".quotemeta($full)." -C ".quotemeta($cwd);
+	}
+elsif ($in{'method'} eq 'zstd-tar') {
+	$full = "$cwd/$in{'arch'}.zst";
+	$command = "ZSTD_CLEVEL=19 tar --zstd -cf ".quotemeta($full)." -C ".quotemeta($cwd);
+	}
+elsif ($in{'method'} eq 'tar') {
 	$full = "$cwd/$in{'arch'}.tar.gz";
 	$command = "tar czf ".quotemeta($full)." -C ".quotemeta($cwd);
 	}

filemin/config.cgi

@@ -41,7 +41,8 @@ print &ui_table_row($text{'config_columns_to_display'},
     &ui_checkbox('columns', 'last_mod_time', $text{'last_mod_time'}, $config{'columns'} =~ /last_mod_time/)
 );
 print &ui_table_row($text{'config_per_page'}, ui_textbox("per_page", $config{'per_page'}, 80));
-print &ui_table_row($text{'file_detect_encoding'}, &ui_yesno_radio('config_portable_module_filemanager_editor_detect_encoding', $config{'config_portable_module_filemanager_editor_detect_encoding'}, 'true', 'false'));
+print &ui_table_row($text{'file_detect_encoding'}, &ui_yesno_radio('config_portable_module_filemanager_editor_detect_encoding', $config{'config_portable_module_filemanager_editor_detect_encoding'} ne 'false' ? 'true' : 'false', 'true', 'false'));
+print &ui_table_row($text{'file_showhiddenfiles'}, &ui_yesno_radio('config_portable_module_filemanager_show_dot_files', $config{'config_portable_module_filemanager_show_dot_files'} ne 'false' ? 'true' : 'false', 'true', 'false'));
 print &ui_table_row($text{'config_bookmarks'}, &ui_textarea("bookmarks", $bookmarks, 5, 40));
 
 print &ui_table_end();

filemin/config.info

@@ -1,2 +1,3 @@
 max=Maximum size for uploaded files,3,Unlimited
-config_portable_module_filemanager_editor_detect_encoding=Fix to prevent encoding detection if forbidden,1,true-Yes,false-No
+config_portable_module_filemanager_editor_detect_encoding=Fix to prevent encoding detection if forbidden,1,true-Yes,false-No
+config_portable_module_filemanager_show_dot_files=Show hidden files,1,true-Yes,false-No

filemin/defaultuconf

@@ -1,3 +1,4 @@
 columns=size,owner_user,permissions,last_mod_time
 per_page=50
-config_portable_module_filemanager_editor_detect_encoding=true
+config_portable_module_filemanager_editor_detect_encoding=true
+config_portable_module_filemanager_show_dot_files=true

filemin/extract.cgi

@@ -12,7 +12,7 @@ if ($archive_type =~ /x-bzip/) {
 	$cmd = "tar xvjfp ".quotemeta("$cwd/$in{'file'}").
 	       " -C ".quotemeta($cwd);
 	}
-elsif ($archive_type =~ /x-tar|\/gzip|x-xz|x-compressed-tar/) {
+elsif ($archive_type =~ /x-tar|\/gzip|x-xz|zstd|x-compressed-tar/) {
 	$cmd = "tar xfp ".quotemeta("$cwd/$in{'file'}").
 	       " -C ".quotemeta($cwd);
 	}

filemin/filemin-lib.pl

@@ -397,6 +397,7 @@ sub print_interface {
                    index($type, "-x-tar") != -1           ||
                    (index($type, "-x-bzip") != -1 && has_command('bzip2')) ||
                    (index($type, "-gzip") != -1   && has_command('gzip'))  ||
+                   (index($type, "zstd") != -1   && has_command('zstd'))  ||
                    (index($type, "-x-xz") != -1   && has_command('xz'))
                   ) &&
                   has_command('tar')))

filemin/index.cgi

@@ -18,7 +18,8 @@ unless (opendir ( DIR, $cwd )) {
     my %secontext;
 
     # Push file names with full paths to array, filtering out "." and ".."
-    @list = map { &simplify_path("$cwd/$_") } grep { $_ ne '.' && $_ ne '..' } readdir(DIR);
+    my $show_dot_files = $userconfig{'config_portable_module_filemanager_show_dot_files'} ne 'false';
+    @list = map { &simplify_path("$cwd/$_") } grep { $_ ne '.' && $_ ne '..' && ($show_dot_files || ($_ !~ /^\./ && $_ !~ /\/\./)) } readdir(DIR);
     closedir(DIR);
 
     # Filter out not allowed paths

filemin/lang/en

@@ -173,6 +173,7 @@ acls_action=Action
 acls_manual=Manual params
 acls_error=<tt>setfacl</tt> command is not found on your system
 file_detect_encoding=Automatically detect file encoding
+file_showhiddenfiles=Show hidden files
 index_return=file listing
 upload_dirs=Directory Upload
 extract_uploaded=Extract Compressed

filemin/save_config.cgi

@@ -13,6 +13,7 @@ $columns =~ s/\0/,/g;
     'columns' => $columns,
     'per_page' => $in{'per_page'},
     'config_portable_module_filemanager_editor_detect_encoding' => $in{'config_portable_module_filemanager_editor_detect_encoding'},
+    'config_portable_module_filemanager_show_dot_files' => $in{'config_portable_module_filemanager_show_dot_files'},
 );
 my $max_allowed = $in{'max_allowed'};
 if($max_allowed) {

filemin/unauthenticated/templates/dialogs.html

@@ -102,7 +102,10 @@
                         <input name="filename" type="text" class="form-control" data-placement="right" data-content="$text{'provide_file_name'}" data-trigger="manual">
                     </div>
                     <select name="method">
-                        <option value="tar">.tar.gz</option>
+                        <option value="plain-tar">.tar</option>
+                        <option value="xz-tar">.tar.xz</option>
+                        <option selected value="tar">.tar.gz</option>
+                        <option value="zstd-tar">.zstd</option>
                         <option value="zip">.zip</option>
                     </select>
                 </form>

filemin/unauthenticated/templates/legacy_dialogs.html

@@ -39,7 +39,10 @@
           <label>$text{'archive_name'}</label>
           <input name="filename" type="text">
           <select name="method">
-              <option value="tar">.tar.gz</option>
+              <option value="plain-tar">.tar</option>
+              <option value="xz-tar">.tar.xz</option>
+              <option selected value="tar">.tar.gz</option>
+              <option value="zstd-tar">.zstd</option>
               <option value="zip">.zip</option>
           </select>
       </div>

firewall/config.info

@@ -1,5 +1,5 @@
 line0=Configurable global options,11
-perpage=Number of rules to display per page,3,50
+perpage=Number of rules to display per page,3,Default (50)
 view_condition=Display condition in rules list?,1,1-Yes,0-No
 view_comment=Display comment in rules list?,1,1-Yes,0-No
 comment_mod=Store comments as,1,0-# comments in save file,1---comment option

firewall/index.cgi

@@ -225,25 +225,17 @@ else {
                 print &ui_hidden("table", $in{'table'});
                 print &ui_hidden("chain", $c);
 
-		if (@rules > $config{'perpage'}) {
+		my $pp = $config{'perpage'};
+		if (@rules > $pp) {
 		        # Need to show arrows
-		        print "<center>\n";
 		        $s = int($in{'start'});
-		        $e = $in{'start'} + $config{'perpage'} - 1;
+		        $e = $in{'start'} + $pp - 1;
 		        $e = @rules-1 if ($e >= @rules);
-		        if ($s) {
+			print &ui_page_flipper(
-		                print &ui_link("?start=".
+		        	&text('index_position', $s+1, $e+1, scalar(@rules)),
-		                                ($s - $config{'perpage'}),
+				undef, undef,
-		                    "<img src=/images/left.gif border=0 align=middle>");
+				$s ? "?start=".($s - $pp) : "",
-		                }
+				$e < @rules-1 ? "?start=".($s + $pp) : "");
-		        print "<font size=+1>",&text('index_position', $s+1, $e+1,
-		                                     scalar(@rules)),"</font>\n";
-		        if ($e < @rules-1) {
-		                print &ui_link("?start=".
-		                               ($s + $config{'perpage'}),
-		                   "<img src=/images/right.gif border=0 align=middle>");
-		                }
-		        print "</center>\n";
 		        }
 		else {
 		        # Can show them all

firewall/lang/en

@@ -1,6 +1,7 @@
 index_title=Linux IPTables Firewall
 index_title_v=IPv4 Firewall
 index_title_v6=IPv6 Firewall
+index_position=Showing rules $1 to $2 of $3
 index_editing=rules file $1
 index_ecommand=The command $1 was not found on your system. Webmin needs this command to configure IPtables.
 index_ekernel=An error occured when checking your current IPtables configuration : $1 This may indicate that your kernel does not support IPtables.

gray-theme/index.cgi

@@ -96,6 +96,7 @@ if ($current_lang_info->{'rtl'} || $current_lang eq "ar") {
 # Page header
 print "<html>\n";
 print "<head>\n";
+print &ui_switch_theme_javascript();
 print "<title>$title</title>\n";
 my $imgdir = "@{[&get_webprefix()]}/images";
 my $prod = 'webmin';

gray-theme/left.cgi

@@ -84,7 +84,7 @@ if (@has > 1) {
 		}
 	print "</div>";
 	}
-
+print &ui_switch_theme_javascript();
 print "<div class='wrapper leftmenu'>\n";
 print "<table id='main' width='100%'><tbody><tr><td>\n";
 

gray-theme/theme.pl

@@ -22,6 +22,23 @@ our $ui_formcount;
 $main::WRAPPER_OPEN = 0;
 $main::COLUMNS_WRAPPER_OPEN = 0;
 
+sub theme_ui_print_header
+{
+my ($text, @args) = @_;
+&header(@args);
+print <<EOL;
+<script>
+(function () {
+	const body = document.querySelector('body');
+	try {
+    	body && body.classList.add('$module_name');
+	} catch (e) {}
+})();
+</script>
+EOL
+print &ui_post_header($text);
+}
+
 # theme_ui_post_header([subtext])
 # Returns HTML to appear directly after a standard header() call
 sub theme_ui_post_header

gray-theme/unauthenticated/gray-theme.css

@@ -697,4 +697,16 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin {
 }
 .ql-compose-container .ql-snow .ql-tooltip {
   z-index: 99;
-}
+}
+
+/* Shell module tweaks */
+.shell pre {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+.shell input[name="cmd"] {
+  max-width: 64.5vw;
+}
+.shell select[name="pcmd"] {
+  max-width: 65vw;
+}

html-editor-lib.pl

@@ -277,24 +277,51 @@ my $html_editor_init_script =
         theme: 'snow'
     });
 
-    // Google Mail editor like keybind for quoting
+    // Google Mail like key bind for creating numbered list (Ctrl+Shift+7)
     editor.keyboard.addBinding({
-      key: '9',
+        key: '7',
-      shiftKey: true,
+        shiftKey: true,
-      ctrlKey: !isMac,
+        ctrlKey: !isMac,
-      metaKey: isMac,
+        metaKey: isMac,
-      format: ['blockquote'],
     }, function(range, context) {
-      this.quill.format('blockquote', false);
+        const currentFormat = this.quill.getFormat(range.index);
+        if (currentFormat.list === 'ordered') {
+            this.quill.format('list', false);
+        } else {
+            this.quill.format('list', 'ordered');
+        }
     });
+
+    // Google Mail like key bind for creating bullet list (Ctrl+Shift+8)
     editor.keyboard.addBinding({
-      key: '9',
+        key: '8',
-      shiftKey: true,
+        shiftKey: true,
-      ctrlKey: !isMac,
+        ctrlKey: !isMac,
-      metaKey: isMac,
+        metaKey: isMac,
     }, function(range, context) {
-      this.quill.format('blockquote', true);
+        const currentFormat = this.quill.getFormat(range.index);
+        if (currentFormat.list === 'bullet') {
+            this.quill.format('list', false);
+        } else {
+            this.quill.format('list', 'bullet');
+        }
     });
+
+    // Google Mail like key bind for creating blockquote (Ctrl+Shift+9)
+    editor.keyboard.addBinding({
+        key: '9',
+        shiftKey: true,
+        ctrlKey: !isMac,
+        metaKey: isMac,
+    }, function(range, context) {
+        const currentFormat = this.quill.getFormat(range.index);
+        if (currentFormat.blockquote) {
+            this.quill.format('blockquote', false);
+        } else {
+            this.quill.format('blockquote', true);
+        }
+    });
+
     editor.on('text-change', function() {
         // This should most probably go to onSubmit event
         targ.value = editor.root.innerHTML + "<br>";

init/init-lib.pl

@@ -2459,10 +2459,8 @@ my $systemd_local_conf = "/etc/systemd/system";
 my $systemd_unit_dir1 = "/usr/lib/systemd/system";
 my $systemd_unit_dir2 = "/lib/systemd/system";
 if ($name) {
-	foreach my $p (
+	foreach my $p ($systemd_local_conf, $systemd_unit_dir1,
-		$systemd_local_conf,
+		       $systemd_unit_dir2) {
-		$systemd_unit_dir1,
-		$systemd_unit_dir2) {
 		if (-r "$p/$name.service"   ||
 		    -r "$p/$name"           ||
 		    -r "$p/$name.target"    ||

itsecur-firewall/itsecur-lib.pl

@@ -983,7 +983,7 @@ elsif ($mode == 3) {
 			  { 'headers' => [ [ 'Content-type', 'application/zip' ],
 					   [ 'Content-Transfer-Encoding', 'base64' ] ],
 			    'data' => $data } ] };
-	$main::errors_must_die = 1;
+	$main::error_must_die = 1;
 	if (&foreign_check("mailboxes")) {
 		&foreign_require("mailboxes", "mailboxes-lib.pl");
 		eval { &mailboxes::send_mail($mail); };

itsecur-firewall/welf.cgi

@@ -111,7 +111,7 @@ elsif ($mode == 3) {
 			    'data' => $body },
 			  { 'headers' => [ [ 'Content-type', 'text/plain' ] ],
 			    'data' => $data } ] };
-	$main::errors_must_die = 1;
+	$main::error_must_die = 1;
 	if (&foreign_check("mailboxes")) {
 		&foreign_require("mailboxes", "mailboxes-lib.pl");
 		eval { &mailboxes::send_mail($mail); };

lang/en

@@ -392,4 +392,6 @@ file_truncated_message_tail=fetched ending $1 of data, truncated $2 out of $3
 
 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
+
 __norefs=1

mailboxes/boxes-lib.pl

@@ -3006,6 +3006,44 @@ if ($switched) {
 return $rv;
 }
 
+# is_gzipped_file(file)
+# Returns 1 if a file is gzip compressed
+sub is_gzipped_file
+{
+my ($file) = @_;
+my $fh;
+my $rv = open($fh, "<", $file);
+return 0 if (!$rv);
+my $two;
+read($fh, $two, 2);
+close($fh);
+return $two eq "\037\213" ? 1 : 0;
+}
+
+# gunzip_mail_file(file)
+# Uncompress a mail file in place
+sub gunzip_mail_file
+{
+my ($file) = @_;
+my $switched = &switch_to_mail_user();
+my $outfile = $file.".$$.uncompressed";
+my @st = stat($file);
+my $ex = system("gunzip -c ".quotemeta($file)."> ".quotemeta($outfile)." 2>/dev/null");
+if ($ex) {
+	unlink($outfile);
+	}
+else {
+	rename($outfile, $file);
+	&set_ownership_permissions($st[4], $st[5], $st[2], $file);
+	utime($st[8], $st[9], $file);
+	}
+if ($switched) {
+	$) = 0;
+	$> = 0; 
+	}
+return !$ex;
+}
+
 # create_as_mail_user(fh, file)
 # Creates a new file, but ensures that it does not yet exist first, and then
 # sets the ownership to the mail user

mailboxes/folders-lib.pl

@@ -1543,6 +1543,33 @@ if ($src->{'sortable'}) {
 	}
 }
 
+# mailbox_uncompress_folder(&folder)
+# If a folder or it's files are gzipped, uncompress them in place
+sub mailbox_uncompress_folder
+{
+my ($folder) = @_;
+if ($folder->{'type'} == 1 || $folder->{'type'} == 3) {
+	my @files = $folder->{'type'} == 1 ?
+			&get_maildir_files($folder->{'file'}) :
+			&get_mhdir_files($folder->{'file'});
+	if ($folder->{'type'} == 1) {
+		foreach my $sf (glob("$folder->{'file'}/.??*")) {
+			push(@files, &get_maildir_files($sf));
+			}
+		}
+	foreach my $f (@files) {
+		if (&is_gzipped_file($f)) {
+			&gunzip_mail_file($f);
+			}
+		}
+	}
+elsif ($folder->{'type'} == 0) {
+	if (&is_gzipped_file($folder->{'file'})) {
+		&gunzip_mail_file($folder->{'file'});
+		}
+	}
+}
+
 # mailbox_copy_mail(&source, &dest, mail, ...)
 # Copy mail from one folder to another
 sub mailbox_copy_mail
@@ -3366,7 +3393,10 @@ local $dmail = {
 			    [ 'Content-Transfer-Encoding' => '7bit' ] ],
 	     'data' => $dsn }
 		] };
-eval { local $main::errors_must_die = 1; &send_mail($dmail); };
+eval {
+	local $main::error_must_die = 1;
+	&send_mail($dmail);
+	};
 return $to;
 }
 

mailboxes/lang/af.auto

@@ -320,7 +320,7 @@ search_elatest=Ontbrekende of ongeldige aantal boodskappe om te soek
 search_withstatus=, met status $1
 
 folder_inbox=posbus
-folder_sent=Gestuurde pos
+folder_sent=Gestuur
 folder_drafts=Drafts
 folder_trash=asblik
 

mailboxes/lang/ar.auto

@@ -320,7 +320,7 @@ search_elatest=عدد الرسائل المفقودة أو غير الصحيحة
 search_withstatus=, with status $1
 
 folder_inbox=صندوق الوارد
-folder_sent=البريد المرسل
+folder_sent=مرسل
 folder_drafts=المسودات
 folder_trash=قمامة، يدمر، يهدم
 

mailboxes/lang/be.auto

@@ -320,7 +320,7 @@ search_elatest=Адсутнічае альбо недапушчальная ко
 search_withstatus=, са статусам $1
 
 folder_inbox=Уваходныя
-folder_sent=Даслана пошта
+folder_sent=Адпраўлена
 folder_drafts=Чарнавікі
 folder_trash=Хлам
 

mailboxes/lang/bg.auto

@@ -320,7 +320,7 @@ search_elatest=Липсващ или невалиден брой съобщен
 search_withstatus=, със статус $1
 
 folder_inbox=Входящи
-folder_sent=Изпратена поща
+folder_sent=Изпратено
 folder_drafts=дама
 folder_trash=боклук
 

mailboxes/lang/ca

@@ -319,7 +319,6 @@ search_elatest=Hi falta el nombre de missatges a buscar  o bé és invàlid
 search_withstatus=, amb estat $1
 
 folder_inbox=Entrada
-folder_sent=Enviat
 folder_drafts=Drafts
 folder_trash=Trash
 

mailboxes/lang/ca.auto

@@ -1,5 +1,7 @@
 index_return=llista d'usuaris
 
+folder_sent=Enviat
+
 editor_heading=Encapçalament
 editor_paragraph=Paràgraf
 editor_fontfamily_default=Per defecte

mailboxes/lang/cs

@@ -295,7 +295,6 @@ search_elatest=Chybějící nebo nevhodný počet zpráv k prohledání
 search_withstatus=, se stavem $1
 
 folder_inbox=Doručená pošta
-folder_sent=Odesláné pošta
 folder_drafts=Koncepty
 folder_trash=Koš
 

mailboxes/lang/cs.auto

@@ -29,6 +29,8 @@ reply_html1=Vytvořte HTML
 search_msg6=Výsledky hledání $1 v poli $2
 search_attach=Musí mít přílohy?
 
+folder_sent=Odesláno
+
 left_mail=Pošta
 left_search=Vyhledávání:
 left_folders=Správa složek

mailboxes/lang/da.auto

@@ -320,7 +320,7 @@ search_elatest=Manglende eller ugyldigt antal meddelelser til søgning
 search_withstatus=, med status $1
 
 folder_inbox=Indbakke
-folder_sent=Sendt post
+folder_sent=Sendt
 folder_drafts=Kladder
 folder_trash=Affald
 

mailboxes/lang/de

@@ -319,7 +319,6 @@ search_elatest=Fehlende oder ungültige Anzahl an Mails für die Suche
 search_withstatus=, mit Status $1
 
 folder_inbox=Posteingang
-folder_sent=Versendete Mail
 folder_drafts=Entwürfe
 folder_trash=Papierkorb
 

mailboxes/lang/de.auto

@@ -1,5 +1,7 @@
 index_return=Benutzerliste
 
+folder_sent=Gesendet
+
 editor_heading=Überschrift
 editor_paragraph=Absatz
 editor_fontfamily_default=Standard

mailboxes/lang/el

@@ -268,7 +268,6 @@ search_elatest=Λείπει ή είναι άκυρος ο αριθμός των
 search_withstatus=, με κατάσταση $1
 
 folder_inbox=Εισερχόμενα
-folder_sent=Απεσταλμένα
 folder_drafts=Πρόχειρα
 folder_trash=Απορρίματα
 

mailboxes/lang/el.auto

@@ -60,6 +60,8 @@ confirm_warnallf=Είστε βέβαιοι ότι θέλετε να διαγρά
 search_msg6=Αποτελέσματα αναζήτησης για $1 στο πεδίο $2
 search_attach=Πρέπει να έχετε συνημμένα;
 
+folder_sent=Απεσταλμένα
+
 sform_header=Προηγμένες επιλογές αναζήτησης ηλεκτρονικού ταχυδρομείου
 sform_andmode=Λειτουργία κριτηρίων
 sform_folder2=Αναζήτηση σε φάκελο (-ες)

mailboxes/lang/en

@@ -320,7 +320,7 @@ search_elatest=Missing or invalid number of messages to search
 search_withstatus=, with status $1
 
 folder_inbox=Inbox
-folder_sent=Sent mail
+folder_sent=Sent
 folder_drafts=Drafts
 folder_trash=Trash
 

mailboxes/lang/es.auto

@@ -238,7 +238,7 @@ search_elatest=Número de mensajes faltantes o no válidos para buscar
 search_withstatus=, con estado $1
 
 folder_inbox=Bandeja de entrada
-folder_sent=Correo enviado
+folder_sent=Enviado
 folder_drafts=Borradores
 folder_trash=Basura
 

mailboxes/lang/eu.auto

@@ -320,7 +320,7 @@ search_elatest=Bilatu beharreko mezu kopuru falta edo baliogabea
 search_withstatus=, egoera $1 egoerarekin
 
 folder_inbox=Sarrerako ontzia
-folder_sent=Bidalitako mezuak
+folder_sent=Bidali
 folder_drafts=Turkiarrak
 folder_trash=Trash
 

mailboxes/lang/fa.auto

@@ -320,7 +320,7 @@ search_elatest=تعداد پیام های نامعتبر یا نامعتبر ا
 search_withstatus=, with status $1
 
 folder_inbox=صندوق ورودی
-folder_sent=نامه ارسال شده
+folder_sent=ارسال شد
 folder_drafts=پیش نویس
 folder_trash=زباله ها
 

mailboxes/lang/fi

@@ -205,7 +205,6 @@ search_nolatest=Kaikki kansiossa
 search_latestnum=Vain viimeisimmät
 search_elatest=Puuttuva tai virheellinen määrä etsittäviä viestejä
 
-folder_sent=Lähetetyt
 folder_drafts=Luonnokset
 folder_trash=Roskakori
 

mailboxes/lang/fi.auto

@@ -125,6 +125,7 @@ search_onestatus=Vain tila
 search_withstatus=, tila $1
 
 folder_inbox=Saapuneet
+folder_sent=Lähetetty
 
 detach_err=Tiedoston irrottaminen epäonnistui
 detach_edir=Ei tiedostoa tai hakemistoa tallennettavaksi syötettyyn

mailboxes/lang/fr

@@ -320,7 +320,6 @@ search_elatest=nombre de messages à rechercher manquant ou invalide
 search_withstatus=, avec statut $1
 
 folder_inbox=Boite de Réception
-folder_sent=Courriers Envoyés
 folder_drafts=Brouillons
 folder_trash=Corbeille
 

mailboxes/lang/fr.auto

@@ -1,3 +1,5 @@
+folder_sent=Envoyé
+
 editor_heading=Titre
 editor_paragraph=Paragraphe
 editor_fontfamily_default=Défaut

mailboxes/lang/he.auto

@@ -320,7 +320,7 @@ search_elatest=מספר הודעות חסר או לא חוקי לחיפוש
 search_withstatus=, with status $1
 
 folder_inbox=תיבת הדואר הנכנס
-folder_sent=שלח מייל
+folder_sent=נשלח
 folder_drafts=טיוטות
 folder_trash=זבל
 

mailboxes/lang/hr.auto

@@ -320,7 +320,7 @@ search_elatest=Nedostaje ili nevažeći broj poruka za pretraživanje
 search_withstatus=, sa statusom $1
 
 folder_inbox=Ulazni spremnik
-folder_sent=Poslana pošta
+folder_sent=Poslano
 folder_drafts=nacrti
 folder_trash=Otpad
 

mailboxes/lang/hu

@@ -147,7 +147,6 @@ search_attach=Szeretne csatolmányokat?
 search_allstatus=Minden
 
 folder_inbox=Bejövő levelek
-folder_sent=Elküldött levelek
 folder_drafts=Piszkozatok
 folder_trash=Kuka
 

mailboxes/lang/hu.auto

@@ -181,6 +181,8 @@ search_latestnum=Csak a legújabb
 search_elatest=Hiányzik vagy érvénytelen a keresett üzenetek száma
 search_withstatus=, állapotával $1
 
+folder_sent=Küldött
+
 detach_err=A fájl leválasztása nem sikerült
 detach_edir=Nincs fájl vagy könyvtár, amelyet menteni kellene a megadott fájlba
 detach_eopen=A $1 megnyitása nem sikerült : $2

mailboxes/lang/it

@@ -316,7 +316,6 @@ search_elatest=Numero di messaggi da cercare mancante o non valido
 search_withstatus=, con stato $1
 
 folder_inbox=Posta in arrivo
-folder_sent=Posta inviata
 folder_drafts=Bozze
 folder_trash=Cestino
 

mailboxes/lang/it.auto

@@ -6,6 +6,8 @@ view_nobody=Questo messaggio non ha contenuti del corpo.
 
 search_msg6=Risultati della ricerca per $1 nel campo $2
 
+folder_sent=Inviato
+
 left_mail=posta
 left_search=Ricerca:
 left_folders=Gestisci cartelle

mailboxes/lang/ja

@@ -295,7 +295,6 @@ search_elatest=Missing or invalid number of messages to search
 search_withstatus=, with status $1
 
 folder_inbox=Inbox
-folder_sent=Sent mail
 folder_drafts=Drafts
 folder_trash=Trash
 

mailboxes/lang/ja.auto

@@ -29,6 +29,8 @@ reply_html1=HTMLを作成
 search_msg6=$2フィールドの$1の検索結果
 search_attach=添付ファイルが必要ですか？
 
+folder_sent=送信済み
+
 left_mail=郵便物
 left_search=探す：
 left_folders=フォルダーを管理する

mailboxes/lang/ko

@@ -285,7 +285,6 @@ search_elatest=검색 메시지수가 지정되지 않았거나 유효하지 않
 search_withstatus=, 상태 $1로
 
 folder_inbox=인박스
-folder_sent=메일 보내기
 folder_drafts=초안
 folder_trash=휴지통
 

mailboxes/lang/ko.auto

@@ -40,6 +40,8 @@ search_ewhat=입력 된 행과 일치하는 텍스트가 없습니다 $1
 search_msg6=$2 필드에서 $1에 대한 검색 결과
 search_attach=첨부 파일이 있어야합니까?
 
+folder_sent=전송된
+
 sform_andmode=기준 모드
 
 left_mail=우편

mailboxes/lang/lt.auto

@@ -320,7 +320,7 @@ search_elatest=Trūksta arba netinkamas ieškomų pranešimų skaičius
 search_withstatus=, su būsena $1
 
 folder_inbox=Pašto dėžutę
-folder_sent=Išsiųsti laiškai
+folder_sent=Išsiųsta
 folder_drafts=Juodraščiai
 folder_trash=Šiukšlių dėžė
 

mailboxes/lang/lv.auto

@@ -320,7 +320,7 @@ search_elatest=Trūkst vai nav derīgs meklējamo ziņojumu skaits
 search_withstatus=, ar statusu $1
 
 folder_inbox=Iesūtne
-folder_sent=Nosūtītais pasts
+folder_sent=Nosūtīts
 folder_drafts=Melnraksti
 folder_trash=Atkritumi
 

mailboxes/lang/ms.auto

@@ -320,7 +320,7 @@ search_elatest=Bilangan mesej yang hilang atau tidak sah untuk dicari
 search_withstatus=, dengan status $1
 
 folder_inbox=Peti masuk
-folder_sent=Menghantar surat
+folder_sent=Dihantar
 folder_drafts=Draf
 folder_trash=Sampah
 

mailboxes/lang/mt.auto

@@ -320,7 +320,7 @@ search_elatest=Numru ta 'messaġġi nieqsa jew invalidi biex tfittex
 search_withstatus=, bi status $1
 
 folder_inbox=Inbox
-folder_sent=Intbagħat il-posta
+folder_sent=Mibgħuta
 folder_drafts=Abbozzi
 folder_trash=Trash
 

mailboxes/lang/nl

@@ -317,7 +317,6 @@ search_elatest=Ontbrekende of ongeldige aantal berichten om te zoeken
 search_withstatus=, met status $1
 
 folder_inbox=Inbox
-folder_sent=Verstuur email
 folder_drafts=Ontwerpen
 folder_trash=Vuilnis
 

mailboxes/lang/nl.auto

@@ -4,6 +4,8 @@ mail_specialsync=Synchronisatie speciaal
 
 search_msg6=Zoekresultaten voor $1 in het veld $2
 
+folder_sent=Verstuurd
+
 left_mail=Mail
 left_search=Zoeken:
 left_folders=Beheer mappen

mailboxes/lang/no

@@ -320,7 +320,6 @@ search_elatest=Manglende eller ugyldig antall meldinger å søke gjennom
 search_withstatus=, med status $1
 
 folder_inbox=Innboks
-folder_sent=Sendt e-post
 folder_drafts=Kladd
 folder_trash=Papirkurv
 

mailboxes/lang/no.auto

@@ -1,3 +1,5 @@
+folder_sent=Sendt
+
 editor_heading=Overskrift
 editor_paragraph=Avsnitt
 editor_fontfamily_default=Misligholde

mailboxes/lang/pl.auto

@@ -179,7 +179,7 @@ search_elatest=Brakująca lub niepoprawna liczba wiadomości do przeszukania
 search_withstatus=, ze statusem $1
 
 folder_inbox=W pudełku
-folder_sent=Wysłany mail
+folder_sent=Wysłano
 folder_drafts=Warcaby
 folder_trash=Śmieci
 

mailboxes/lang/pt.auto

@@ -287,7 +287,7 @@ search_elatest=Número de mensagens ausente ou inválido para pesquisa
 search_withstatus=, com status $1
 
 folder_inbox=Caixa de entrada
-folder_sent=Correspondência enviada
+folder_sent=Enviado
 folder_drafts=Rascunhos
 folder_trash=Lixo
 

mailboxes/lang/pt_BR

@@ -1,3 +1,2 @@
 folder_inbox=Caixa de Entrada
-folder_sent=E-mais Enviados
 folder_trash=Lixo

mailboxes/lang/pt_BR.auto

@@ -319,6 +319,7 @@ search_latestnum=Apenas os mais recentes
 search_elatest=Número de mensagens ausente ou inválido para pesquisa
 search_withstatus=, com status $1
 
+folder_sent=Enviado
 folder_drafts=Rascunhos
 
 detach_err=Falha ao desanexar arquivo

mailboxes/lang/ro.auto

@@ -320,7 +320,7 @@ search_elatest=Număr de mesaje lipsă sau nevalide de căutat
 search_withstatus=, cu statut $1
 
 folder_inbox=Inbox
-folder_sent=E-mail trimis
+folder_sent=Trimis
 folder_drafts=Schițe
 folder_trash=Gunoi
 

mailboxes/lang/ru.auto

@@ -320,7 +320,7 @@ search_elatest=Отсутствует или неверное количеств
 search_withstatus=со статусом $1
 
 folder_inbox=входящие
-folder_sent=Отправленные письма
+folder_sent=Отправил
 folder_drafts=Черновики
 folder_trash=дрянь
 

mailboxes/lang/sk.auto

@@ -320,7 +320,7 @@ search_elatest=Chýba alebo je neplatný počet správ na vyhľadávanie
 search_withstatus=, so stavom $1
 
 folder_inbox=Doručená pošta
-folder_sent=Odoslaná pošta
+folder_sent=Odoslané
 folder_drafts=dáma
 folder_trash=Smeti
 

mailboxes/lang/sl.auto

@@ -320,7 +320,7 @@ search_elatest=Manjkajoče ali neveljavno število sporočil za iskanje
 search_withstatus=, s statusom $1
 
 folder_inbox=Prejeto
-folder_sent=Poslana pošta
+folder_sent=Poslano
 folder_drafts=Osnutki
 folder_trash=Smeti
 

mailboxes/lang/sv.auto

@@ -260,7 +260,7 @@ search_elatest=Det saknas eller ogiltigt antal meddelanden att söka efter
 search_withstatus=, med status $1
 
 folder_inbox=Inkorg
-folder_sent=Skickade post
+folder_sent=Skickat
 folder_drafts=utkast
 folder_trash=Skräp
 

mailboxes/lang/th.auto

@@ -320,7 +320,7 @@ search_elatest=จำนวนข้อความที่ขาดหาย
 search_withstatus=ด้วยสถานะ $1
 
 folder_inbox=กล่องขาเข้า
-folder_sent=ส่งอีเมล
+folder_sent=ส่งแล้ว
 folder_drafts=ร่าง
 folder_trash=ขยะ
 

mailboxes/lang/tr

@@ -275,7 +275,6 @@ search_elatest=Arama için hatalı veya gecersiz sayıda mesaj
 search_withstatus=, durum kodu $1 olan
 
 folder_inbox=Gelen Kutusu
-folder_sent=Gönderilen postalar
 folder_drafts=Taslaklar
 folder_trash=Çop Kutusu
 

mailboxes/lang/tr.auto

@@ -52,6 +52,8 @@ send_title2=Posta Kaydedildi
 search_msg6=$2 alanında $1 için arama sonuçları
 search_attach=Ekleri olmalı mı?
 
+folder_sent=Gönderilmiş
+
 sform_header=Gelişmiş e-posta arama seçenekleri
 sform_andmode=Ölçüt modu
 sform_folder2=Klasörlerde ara

mailboxes/lang/uk.auto

@@ -320,7 +320,7 @@ search_elatest=Відсутня або недійсна кількість по
 search_withstatus=, зі статусом $1
 
 folder_inbox=Вхідні
-folder_sent=Надіслати пошту
+folder_sent=Надісланий
 folder_drafts=Чернетки
 folder_trash=Сміття
 

mailboxes/lang/ur.auto

@@ -320,7 +320,7 @@ search_elatest=تلاش کرنے کیلئے پیغامات کی گمشدہ یا
 search_withstatus=, with status $1
 
 folder_inbox=ان باکس
-folder_sent=میل بھیجا
+folder_sent=بھیجا
 folder_drafts=ڈرافٹس
 folder_trash=کوڑے دان
 

mailboxes/lang/vi.auto

@@ -320,7 +320,7 @@ search_elatest=Thiếu hoặc không hợp lệ số lượng tin nhắn để t
 search_withstatus=, với trạng thái $1
 
 folder_inbox=Hộp thư đến
-folder_sent=Gửi mail
+folder_sent=Đã gửi
 folder_drafts=Dự thảo
 folder_trash=Rác
 

mailboxes/lang/zh.auto

@@ -234,7 +234,7 @@ search_elatest=要搜索的消息丢失或数量无效
 search_withstatus=，状态为$1
 
 folder_inbox=收件箱
-folder_sent=发送邮件
+folder_sent=发送
 folder_drafts=草稿
 folder_trash=垃圾
 

mailboxes/lang/zh_TW

@@ -213,7 +213,6 @@ search_local=在本地資料夾
 search_all=在所有資料夾
 
 folder_inbox=收件夾
-folder_sent=傳送郵件
 folder_drafts=草稿
 folder_trash=垃圾桶
 

mailboxes/lang/zh_TW.auto

@@ -117,6 +117,8 @@ search_latestnum=只有最新
 search_elatest=要搜索的消息丟失或數量無效
 search_withstatus=，狀態為$1
 
+folder_sent=發送
+
 sform_header=進階電子郵件搜尋選項
 sform_andmode=標準模式
 sform_folder2=搜索文件夾

makedist.pl

@@ -60,6 +60,7 @@ $vers || usage();
 	  "webmin-search-lib.pl", "WebminCore.pm",
 	  "record-login.pl", "record-logout.pl", "record-failed.pl",
 	  "robots.txt", "unauthenticated", "bin", "html-editor-lib.pl",
+	  "switch_theme.cgi",
 	 );
 if ($min) {
 	# Only those required by others

makemodulerpm.pl

@@ -33,7 +33,7 @@ $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin";
 my $allow_overwrite = 0;
 
 my ($force_theme, $rpmdepends, $no_prefix, $vendor, $provides, $url,
-    $force_usermin, $final_mod, $sign, $epoch, $dir, $ver, @extrareqs,
+    $force_usermin, $final_mod, $sign, $keyname, $epoch, $dir, $ver, @extrareqs,
     @exclude);
 
 # Parse command-line args
@@ -85,6 +85,9 @@ while(@ARGV) {
 	elsif ($a eq "--sign") {
 		$sign = 1;
 		}
+	elsif ($a eq "--key") {
+		$keyname = shift(@ARGV);
+		}
 	elsif ($a eq "--epoch") {
 		$epoch = shift(@ARGV);
 		}
@@ -426,7 +429,8 @@ unlink("$rpm_source_dir/$mod.tar.gz");
 
 # Sign if requested
 if ($sign) {
-	system("echo | rpm --resign $rpm_dir/$prefix$mod-$ver-$release.noarch.rpm $source_rpm_dir/$prefix$mod-$ver-$release.src.rpm");
+	my $keyflag = $keyname ? "-D '_gpg_name $keyname'" : "";
+	system("echo | rpm --resign $keyflag $rpm_dir/$prefix$mod-$ver-$release.noarch.rpm $source_rpm_dir/$prefix$mod-$ver-$release.src.rpm");
 	}
 
 if ($target_dir =~ /:/) {

makerpm.pl

@@ -86,7 +86,7 @@ Version: $ver
 Release: $rel
 Provides: %{name}-%{version} perl(WebminCore)
 Requires(pre): /usr/bin/perl
-Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar gzip
+Requires: /bin/sh /usr/bin/perl perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar gzip
 Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece) perl(Encode::Detect) lynx
 AutoReq: 0
 License: BSD-3-clause

miniserv.pl

@@ -1303,11 +1303,10 @@ if ($header_timeout > 10*60) {
 	$header_timeout = 10*60;
 	}
 
-# Wait at most 60 secs for start of headers for initial requests, or
-# 10 minutes for kept-alive connections
 local $rmask;
 vec($rmask, fileno(SOCK), 1) = 1;
 local $to = $checked_timeout ? 10*60 : $header_timeout;
+print DEBUG "handle_request: waiting for $to seconds\n";
 local $sel = select($rmask, undef, undef, $to);
 if (!$sel) {
 	if ($checked_timeout) {
@@ -4749,10 +4748,15 @@ if ($config{'ssl_cipher_list'}) {
 			     "$@\n";
 		}
 	}
+
+# Accept the SSL connection
 Net::SSLeay::set_fd($ssl_con, fileno($sock));
-if (!Net::SSLeay::accept($ssl_con)) {
+alarm(10);
-	return undef;
+$SIG{'ALRM'} = sub { die "timeout" };
-	}
+my $ok = Net::SSLeay::accept($ssl_con);
+alarm(0);
+return undef if (!$ok);
+
 # Check for a per-hostname SSL context and use that instead
 if (defined(&Net::SSLeay::get_servername)) {
 	my $h = Net::SSLeay::get_servername($ssl_con);

mysql/lang/en

@@ -865,6 +865,7 @@ root_epass1=No new password entered
 root_epass2=Passwords do not match
 root_none=No password!
 root_auto=Automatic (typically <tt>root</tt>)
+root_socket=The MySQL <tt>$1</tt> user is using Unix socket authentication, so no password is needed and the password cannot be changed.
 
 mysqlpass_err=MySQL safe mode
 mysqlpass_esafecmd=The command $1 needed to start MySQL with authentication disabled was not found