Update to 1.600. Closes PR/45066.

Too many changes to list here.

14 files changed, 115 insertions, 106 deletions

diff --git a/sysutils/webmin/patches/patch-aa b/sysutils/webmin/patches/patch-aa
index f5ae9e56e37..72b3b6accb4 100644
--- a/sysutils/webmin/patches/patch-aa
+++ b/sysutils/webmin/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $
+
 --- setup.sh.orig	2009-03-18 07:30:26.000000000 +0200
 +++ setup.sh	2009-04-09 12:24:40.000000000 +0300
 @@ -35,6 +35,11 @@
diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac
index 96741162377..1f7ef76e9b4 100644
--- a/sysutils/webmin/patches/patch-ac
+++ b/sysutils/webmin/patches/patch-ac
@@ -1,30 +1,32 @@
---- software/search.cgi.orig	2009-03-18 07:30:27.000000000 +0200
-+++ software/search.cgi	2009-04-09 12:27:58.000000000 +0300
-@@ -34,7 +34,7 @@
+$NetBSD: patch-ac,v 1.5 2012/11/02 19:02:51 shattered Exp $
+
+--- software/search.cgi.orig	2011-04-27 00:18:43.000000000 +0200
++++ software/search.cgi	2011-06-15 23:15:13.000000000 +0200
+@@ -34,7 +34,7 @@ if (@match == 1 && $in{'goto'}) {
  if (@match) {
  	@match = sort { lc($packages{$a,'name'}) cmp lc($packages{$b,'name'}) }
  		      @match;
 -	print "<b>",&text('search_match', "<tt>$s</tt>"),"</b><p>\n";
-+	print "<b>",&text('search_match', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
++        print "<b>",&text('search_match', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
  	print &ui_form_start("delete_packs.cgi", "post");
  	print &ui_hidden("search", $in{'search'});
  	@tds = ( "width=5" );
-@@ -47,7 +47,8 @@
- 				  $text{'search_desc'} ], 100, 0, \@tds);
- 	foreach $i (@match) {
+@@ -49,7 +49,8 @@ if (@match) {
  		local @cols;
+ 		local $v = $packages{$i,'shortversion'} ||
+ 			   $packages{$i,'version'};
 -		push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=".
-+		push(@cols, "<a href=\"edit_pack.cgi?search=" .
-+			&urlize($s) . "&package=".
++                push(@cols, "<a href=\"edit_pack.cgi?search=" .
++                       &urlize($s) . "&package=".
  		      &urlize($packages{$i,'name'})."&version=".
  		      &urlize($packages{$i,'version'})."\">".&html_escape(
- 			$packages{$i,'name'}.($packages{$i,'version'} ?
-@@ -69,7 +70,7 @@
+ 			$packages{$i,'name'}.($v ?  " $v" : ""))."</a>");
+@@ -70,7 +71,7 @@ if (@match) {
  	print &ui_form_end([ [ undef, $text{'search_delete'} ] ]);
  	}
  else {
 -	print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n";
-+	print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
++        print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
  	}
  
  &ui_print_footer("", $text{'index_return'});
diff --git a/sysutils/webmin/patches/patch-ad b/sysutils/webmin/patches/patch-ad
index fc7a6aba4f7..3c4cdfc66f0 100644
--- a/sysutils/webmin/patches/patch-ad
+++ b/sysutils/webmin/patches/patch-ad
@@ -1,3 +1,5 @@
+$NetBSD: patch-ad,v 1.8 2012/11/02 19:02:51 shattered Exp $
+
 --- os_list.txt.orig	2009-03-18 07:30:26.000000000 +0200
 +++ os_list.txt	2009-04-09 12:31:24.000000000 +0300
 --- os_list.txt.orig	2009-03-18 05:30:26.000000000 +0000
@@ -24,11 +26,3 @@
  
  # BSDI (may not be detected properly)
  BSDI				$1	freebsd		$1	$uname =~ /BSDI.*\s([0-9\.]+)/i
-@@ -325,6 +319,7 @@ Generic Linux			2.4	generic-linux	2.4	`u
- Generic Linux			2.5	generic-linux	2.5	`uname -r` =~ /2\.4\./
- Generic Linux			2.6	generic-linux	2.6	`uname -r` =~ /2\.6\./
- Generic Linux			2.7	generic-linux	2.7	`uname -r` =~ /2\.7\./
-+Generic Linux			$1	generic-linux	$1	`uname -r` =~ /3\.[0-9]+/
- 
- # Windows
- Windows				XP	windows		xp	(-d "c:/windows" || -d "c:/winnt") && `ver` =~ /XP/
diff --git a/sysutils/webmin/patches/patch-ae b/sysutils/webmin/patches/patch-ae
index e9b74a8c486..dcccc8d9e2f 100644
--- a/sysutils/webmin/patches/patch-ae
+++ b/sysutils/webmin/patches/patch-ae
@@ -1,11 +1,13 @@
---- man/module.info.orig	2009-03-18 07:30:39.000000000 +0200
-+++ man/module.info	2009-04-09 12:33:13.000000000 +0300
+$NetBSD: patch-ae,v 1.5 2012/11/02 19:02:51 shattered Exp $
+
+--- man/module.info.orig	2011-04-27 00:19:08.000000000 +0200
++++ man/module.info	2011-06-15 23:17:56.000000000 +0200
 @@ -9,7 +9,7 @@
  name=Man
  desc_tr=K�lavuz Sayfalar
  desc_de=Systemdokumentation
--os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux
-+os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux dragonfly
+-os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux pardus-linux
++os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux pardus-linux dragonfly
  desc_sk=Syst�mov� dokument�cia
  desc_zh_CN=ʹ���ֲ�
  risk=low medium high
diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag
index e703752da43..c9895df08eb 100644
--- a/sysutils/webmin/patches/patch-ag
+++ b/sysutils/webmin/patches/patch-ag
@@ -1,6 +1,8 @@
---- proc/module.info.orig	2009-03-18 07:30:39.000000000 +0200
-+++ proc/module.info	2009-04-09 12:34:49.000000000 +0300
-@@ -11,7 +11,7 @@
+$NetBSD: patch-ag,v 1.4 2012/11/02 19:02:51 shattered Exp $
+
+--- proc/module.info.orig	2012-01-22 00:47:19.000000000 +0000
++++ proc/module.info
+@@ -12,7 +12,7 @@ desc_ko_KR.UTF-8=실행중인 프로세�
  name=Process Manager
  desc_tr=�al��an S�re�ler
  desc_de=Laufende Prozesse
@@ -8,4 +10,4 @@
 +os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly
  desc_zh_CN=���̹�����
  risk=medium high
- desc_ja_JP.UTF-8=実行プロセス
+ desc_pl.UTF-8=Działające procesy
diff --git a/sysutils/webmin/patches/patch-ah b/sysutils/webmin/patches/patch-ah
index 5b6b5c99f43..dba5d394ab9 100644
--- a/sysutils/webmin/patches/patch-ah
+++ b/sysutils/webmin/patches/patch-ah
@@ -1,11 +1,13 @@
---- cron/module.info.orig	2009-03-18 07:30:40.000000000 +0200
-+++ cron/module.info	2009-04-09 12:35:58.000000000 +0300
+$NetBSD: patch-ah,v 1.5 2012/11/02 19:02:51 shattered Exp $
+
+--- cron/module.info.orig	2011-04-27 00:19:08.000000000 +0200
++++ cron/module.info	2011-06-15 23:19:12.000000000 +0200
 @@ -10,7 +10,7 @@
  name=Cron Manager
  desc_tr=Zamanland�r�lm�� G�revler
  desc_de=Geplante Auftr&#228;ge (Cron)
--os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows
-+os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows dragonfly
+-os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows pardus-linux
++os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows pardus-linux dragonfly
  desc_sk=Cron Pl�nova� �loh
  desc_zh_CN=Cron �������
  risk=low medium high
diff --git a/sysutils/webmin/patches/patch-ai b/sysutils/webmin/patches/patch-ai
index 2c1d0a4d45b..01055b31c99 100644
--- a/sysutils/webmin/patches/patch-ai
+++ b/sysutils/webmin/patches/patch-ai
@@ -1,11 +1,13 @@
---- init/module.info.orig	2009-03-18 07:30:40.000000000 +0200
-+++ init/module.info	2009-04-09 12:37:02.000000000 +0300
-@@ -22,7 +22,7 @@
- desc_ru_SU=�������� � ���������� ������ �������
+$NetBSD: patch-ai,v 1.5 2012/11/02 19:02:51 shattered Exp $
+
+--- init/module.info.orig	2011-04-27 00:19:08.000000000 +0200
++++ init/module.info	2011-06-15 23:20:14.000000000 +0200
+@@ -10,7 +10,7 @@
+ name=Boot Manager
  desc_tr=A��l�� ve Kapan��
  desc_de=System-Start und -Stop
--os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows
-+os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows dragonfly
+-os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows pardus-linux
++os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows pardus-linux dragonfly
  desc_sk=�tart a vypnutie
- desc_ko_KR.euc=���� �� ���� 
  desc_zh_CN=�����͹ػ�
+ risk=low medium high
diff --git a/sysutils/webmin/patches/patch-an b/sysutils/webmin/patches/patch-an
index 5fe8f1fd446..b39d7c9f44e 100644
--- a/sysutils/webmin/patches/patch-an
+++ b/sysutils/webmin/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD: patch-an,v 1.2 2012/11/02 19:02:51 shattered Exp $
 
 --- man/search.cgi.orig	2007-09-21 23:26:43.000000000 +0200
 +++ man/search.cgi
@@ -12,13 +12,3 @@ $NetBSD: patch-an,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
  &ui_print_header(&text('search_for', $for), $text{'search_title'}, "");
  if (@rv) {
  	#@rv = sort { $b->[4] <=> $a->[4] } @rv;
-@@ -280,7 +281,8 @@ if (@rv) {
- 	print &ui_columns_end();
- 	}
- else {
--	print "<p><b>",&text('search_none', "<tt>$in{'for'}</tt>"),"</b><p>\n";
-+	print "<p><b>",&text('search_none', "<tt>" . &html_escape($in{'for'}) .
-+		"</tt>"),"</b><p>\n";
- 	}
- 
- &ui_print_footer("", $text{'index_return'});
diff --git a/sysutils/webmin/patches/patch-ap b/sysutils/webmin/patches/patch-ap
index 60762bb64d8..4dd454c1ea1 100644
--- a/sysutils/webmin/patches/patch-ap
+++ b/sysutils/webmin/patches/patch-ap
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD: patch-ap,v 1.2 2012/11/02 19:02:51 shattered Exp $
 
---- webminlog/search.cgi.orig	2007-09-21 23:26:52.000000000 +0200
-+++ webminlog/search.cgi
-@@ -91,7 +91,8 @@ $searchmsg = join(" ",
- if (@match) {
+--- webminlog/search.cgi.orig	2011-04-27 00:18:53.000000000 +0200
++++ webminlog/search.cgi	2011-06-15 23:34:38.000000000 +0200
+@@ -147,7 +147,8 @@ elsif (@match) {
+ 	# Show search results in table
  	if ($in{'sid'}) {
  		print "<b>",&text('search_sid', "<tt>$match[0]->{'user'}</tt>",
 -				  "<tt>$in{'sid'}</tt>")," ..</b><p>\n";
-+				  "<tt>" . &html_escape($in{'sid'}) . "</tt>"),
-+				  " ..</b><p>\n";
++                                 "<tt>" . &html_escape($in{'sid'}) . "</tt>"),
++                                 " ..</b><p>\n";
  		}
  	elsif ($in{'uall'} == 1 && $in{'mall'} && $in{'tall'}) {
  		print "<b>$text{'search_critall'} ..</b><p>\n";
diff --git a/sysutils/webmin/patches/patch-av b/sysutils/webmin/patches/patch-av
index 34206fde175..77514508cc1 100644
--- a/sysutils/webmin/patches/patch-av
+++ b/sysutils/webmin/patches/patch-av
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD: patch-av,v 1.2 2012/11/02 19:02:51 shattered Exp $
 
---- ldap-useradmin/search_user.cgi.orig	2007-09-21 23:28:25.000000000 +0200
-+++ ldap-useradmin/search_user.cgi
-@@ -23,8 +23,8 @@ elsif ($in{'match'} == 3) {
+--- ldap-useradmin/search_user.cgi.orig	2011-04-27 00:19:01.000000000 +0200
++++ ldap-useradmin/search_user.cgi	2011-06-15 23:36:01.000000000 +0200
+@@ -24,8 +24,8 @@ elsif ($in{'match'} == 3) {
  $rv = $ldap->search(base => $base,
- 		    filter => "(&(objectClass=posixAccount)$search)");
+ 		    filter => "(&".&user_filter().$search.")");
  if ($rv->code) {
 -	&error(&text('search_err', "<tt>$search</tt>",
 -		     "<tt>$base</tt>", $rv->error));
-+	&error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
-+		     "<tt>" . &html_escape($base) . "</tt>", $rv->error));
++       &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
++                    "<tt>" . &html_escape($base) . "</tt>", $rv->error));
  	}
  @users = $rv->all_entries;
  
diff --git a/sysutils/webmin/patches/patch-aw b/sysutils/webmin/patches/patch-aw
index 74c16b27d0c..50cbf502e8f 100644
--- a/sysutils/webmin/patches/patch-aw
+++ b/sysutils/webmin/patches/patch-aw
@@ -1,15 +1,15 @@
-$NetBSD: patch-aw,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD: patch-aw,v 1.2 2012/11/02 19:02:51 shattered Exp $
 
---- ldap-useradmin/search_group.cgi.orig	2007-09-21 23:28:25.000000000 +0200
-+++ ldap-useradmin/search_group.cgi
-@@ -23,8 +23,8 @@ elsif ($in{'match'} == 3) {
+--- ldap-useradmin/search_group.cgi.orig	2011-04-27 00:19:01.000000000 +0200
++++ ldap-useradmin/search_group.cgi	2011-06-15 23:37:06.000000000 +0200
+@@ -24,8 +24,8 @@ elsif ($in{'match'} == 3) {
  $rv = $ldap->search(base => $base,
- 		    filter => "(&(objectClass=posixGroup)$search)");
+ 		    filter => "(&".&group_filter().$search.")");
  if ($rv->code) {
 -	&error(&text('search_err', "<tt>$search</tt>",
 -		     "<tt>$base</tt>", $rv->error));
-+	&error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
-+		     "<tt>" . &html_escape($base) . "</tt>", $rv->error));
++       &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
++                    "<tt>" . &html_escape($base) . "</tt>", $rv->error));
  	}
  @groups = $rv->all_entries;
  
diff --git a/sysutils/webmin/patches/patch-ax b/sysutils/webmin/patches/patch-ax
index 00e77bffec8..f9174f218c5 100644
--- a/sysutils/webmin/patches/patch-ax
+++ b/sysutils/webmin/patches/patch-ax
@@ -1,48 +1,49 @@
-$NetBSD: patch-ax,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD: patch-ax,v 1.2 2012/11/02 19:02:51 shattered Exp $
 
---- htaccess-htpasswd/search.cgi.orig	2007-09-21 23:28:30.000000000 +0200
-+++ htaccess-htpasswd/search.cgi
-@@ -19,7 +19,8 @@ $in{'search'} =~ /^\// && $in{'search'} 
+--- htaccess-htpasswd/search.cgi.orig	2011-04-27 00:19:02.000000000 +0200
++++ htaccess-htpasswd/search.cgi	2011-06-15 23:23:42.000000000 +0200
+@@ -19,7 +19,8 @@
  
  @dirs = &list_directories();
  %got = map { ( "$_->[0]/$config{'htaccess'}", 1 ) } @dirs;
 -print "<b>",&text('search_doing', "<tt>$in{'search'}</tt>"),"</b><p>\n";
 +print "<b>",&text('search_doing', "<tt>" . &html_escape($in{'search'}) .
-+	"</tt>"), "</b><p>\n";
++       "</tt>"), "</b><p>\n";
  
  # Use the find command
  &switch_user();
-@@ -28,24 +29,28 @@ open(FIND, "find ".quotemeta($in{'search
+@@ -28,10 +29,12 @@
  while($f = <FIND>) {
  	chop($f);
  	if ($got{$f}) {
 -		print &text('search_already', "<tt>$f</tt>"),"<br>\n";
-+		print &text('search_already', "<tt>" . &html_escape($f) .
-+			"</tt>"),"<br>\n";
++               print &text('search_already', "<tt>" . &html_escape($f) .
++                       "</tt>"),"<br>\n";
  		}
  	elsif (!open(TEST, $f)) {
 -		print &text('search_open', "<tt>$f</tt>", $!),"<br>\n";
-+		print &text('search_open', "<tt>" . &html_escape($f) . "</tt>",
-+			$!),"<br>\n";
++               print &text('search_open', "<tt>" . &html_escape($f) . "</tt>",
++                       $!),"<br>\n";
  		}
  	else {
  		$conf = &foreign_call($apachemod, "get_htaccess_config", $f);
- 		$currfile = &foreign_call($apachemod, "find_directive",
- 					  "AuthUserFile", $conf, 1);
- 		if ($currfile) {
+@@ -40,14 +43,16 @@
+ 		$require = &foreign_call($apachemod, "find_directive",
+ 					 "require", $conf, 1);
+ 		if ($currfile && $require) {
 -			print &text('search_found', "<tt>$f</tt>",
 -				    "<tt>$currfile</tt>"),"<br>\n";
-+			print &text('search_found', "<tt>" . &html_escape($f) .
-+				"</tt>", "<tt>" . &html_escape($currfile) .
-+				"</tt>"),"<br>\n";
++                       print &text('search_found', "<tt>" . &html_escape($f) .
++                               "</tt>", "<tt>" . &html_escape($currfile) .
++                               "</tt>"),"<br>\n";
  			local $d = $f;
  			$d =~ s/\/$config{'htaccess'}$//;
  			push(@dirs, [ $d, $currfile ]);
  			}
  		else {
 -			print &text('search_noprot', "<tt>$f</tt>"),"<br>\n";
-+			print &text('search_noprot', "<tt>" .
-+				&html_escape($f) . "</tt>"),"<br>\n";
++                       print &text('search_noprot', "<tt>" .
++                               &html_escape($f) . "</tt>"),"<br>\n";
  			}
  		}
  	}
diff --git a/sysutils/webmin/patches/patch-ay b/sysutils/webmin/patches/patch-ay
index 1a3911e67e0..89efe5723cb 100644
--- a/sysutils/webmin/patches/patch-ay
+++ b/sysutils/webmin/patches/patch-ay
@@ -1,6 +1,8 @@
---- mailboxes/mail_search.cgi.orig	2009-03-18 07:30:35.000000000 +0200
-+++ mailboxes/mail_search.cgi	2009-04-09 12:43:30.000000000 +0300
-@@ -46,7 +46,8 @@
+$NetBSD: patch-ay,v 1.3 2012/11/02 19:02:51 shattered Exp $
+
+--- mailboxes/mail_search.cgi.orig	2012-06-29 22:31:50.000000000 +0000
++++ mailboxes/mail_search.cgi
+@@ -46,7 +46,8 @@ if ($in{'simple'}) {
  		@searchlist = ( [ $field, $what ] );
  		@rv = &mailbox_search_mail(\@searchlist, 0, $folder);
  		print "<p><b>",&text('search_results5', scalar(@rv),
@@ -10,7 +12,7 @@
  		}
  	else {
  		# Just search by Subject and From in one folder
-@@ -73,7 +74,8 @@
+@@ -73,7 +74,8 @@ if ($in{'simple'}) {
  			&error($text{'search_eboolean'});
  			}
  		print "<p><b>",&text('search_results2', scalar(@rv),
@@ -20,27 +22,32 @@
  		}
  	foreach $mail (@rv) {
  		$mail->{'folder'} = $folder;
-@@ -106,8 +108,8 @@
+@@ -106,9 +108,9 @@ else {
  # Show list of messages, with form
  if (@rv) {
  	print &ui_form_start("delete_mail.cgi", "post");
 -	print &ui_hidden("user", $in{'user'});
+-	print &ui_hidden("dom", $in{'dom'});
 -	print &ui_hidden("folder", $in{'folder'});
 +	print &ui_hidden("user", &html_escape($in{'user'}));
-+	print &ui_hidden("folder", &html_escape($in{'folder'}));
++	print &ui_hidden("dom", &html_escape($in{'folder'}));
++ 	print &ui_hidden("folder", &html_escape($in{'folder'}));
  	if ($config{'top_buttons'} && !$multi_folder) {
  		&show_buttons(1, \@folders, $folder, \@rv, $in{'user'}, 1);
  		}
-@@ -121,8 +123,9 @@
+@@ -121,10 +123,10 @@ if (@rv) {
+ else {
  	print "<b>$text{'search_none'}</b> <p>\n";
  	}
- 
+-
 -&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=$in{'folder'}",
 -				$text{'sform_return'} ),
--	"list_mail.cgi?user=$in{'user'}&folder=$in{'folder'}", $text{'mail_return'},
+-	"list_mail.cgi?user=$in{'user'}&folder=$in{'folder'}&dom=$in{'dom'}",
+-	  $text{'mail_return'},
++  
 +&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=" .
 +	&urlize($in{'folder'}), $text{'sform_return'} ),
 +	"list_mail.cgi?user=" . &urlize($in{'user'}) . "&folder=" .
-+	&urlize($in{'folder'}), $text{'mail_return'},
- 	"", $text{'index_return'});
++	&urlize($in{'folder'}) . "&dom=" . &urlize($in{'dom'}), $text{'mail_return'},
+ 	&user_list_link(), $text{'index_return'});
  
diff --git a/sysutils/webmin/patches/patch-az b/sysutils/webmin/patches/patch-az
index 6ac30caaf8c..d401e567c3c 100644
--- a/sysutils/webmin/patches/patch-az
+++ b/sysutils/webmin/patches/patch-az
@@ -1,22 +1,27 @@
---- mailboxes/search_form.cgi.orig	2009-03-18 07:30:35.000000000 +0200
-+++ mailboxes/search_form.cgi	2009-04-09 12:47:29.000000000 +0300
-@@ -13,8 +13,8 @@
+$NetBSD: patch-az,v 1.3 2012/11/02 19:02:51 shattered Exp $
+
+--- mailboxes/search_form.cgi.orig	2012-06-29 22:31:51.000000000 +0000
++++ mailboxes/search_form.cgi
+@@ -13,9 +13,9 @@ require './mailboxes-lib.pl';
  
  # Start of form
  print &ui_form_start("mail_search.cgi");
 -print &ui_hidden("user", $in{'user'});
+-print &ui_hidden("dom", $in{'dom'});
 -print &ui_hidden("ofolder", $in{'folder'});
 +print &ui_hidden("user", &html_escape($in{'user'}));
++print &ui_hidden("dom", &html_escape($in{'user'}));
 +print &ui_hidden("ofolder", &html_escape($in{'folder'}));
  print &ui_table_start($text{'sform_header'}, "width=100%", 2);
  
  # And/or mode
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ print &ui_table_row($text{'sform_folder2
  print &ui_table_end();
  print &ui_form_end([ [ undef, $text{'sform_ok'} ] ]);
  
 -&ui_print_footer("list_mail.cgi?folder=$in{'folder'}&user=".
+-		  &urlize($in{'user'})."&dom=$in{'dom'}", $text{'mail_return'},
 +&ui_print_footer("list_mail.cgi?folder=" . &urlize($in{'folder'}) . "&user=".
- 		  &urlize($in{'user'}), $text{'mail_return'},
- 		 "", $text{'index_return'});
++		  &urlize($in{'user'})."&dom=".&urlize($in{'dom'}), $text{'mail_return'},
+ 		 &user_list_link(), $text{'index_return'});