Committed missed files

diff --git a/copyconfig.pl b/copyconfig.pl
index 78145a5..798befe 100644 (file)
--- a/copyconfig.pl
+++ b/copyconfig.pl
@@ -112,8 +112,6 @@ foreach $m (@mods) {
                }
        }
 
-print join(" ", @newmods),"\n";
-
 # read_file(file, array)
 # Fill an associative array with name=value pairs from a file
 sub read_file

diff --git a/fastrpc.cgi b/fastrpc.cgi
index fc15fa0..517cf40 100755 (executable)
--- a/fastrpc.cgi
+++ b/fastrpc.cgi
@@ -61,7 +61,11 @@ while(1) {
        local $rmask;
        vec($rmask, fileno(SOCK), 1) = 1;
        local $sel = select($rmask, undef, undef, 60);
-       last if ($sel <= 0);
+       if ($sel <= 0) {
+               print STDERR "fastrpc: session timed out\n"
+                       if ($gconfig{'rpcdebug'});
+               last;
+               }
 
        local $line = <SOCK>;
        last if (!$line);
@@ -225,6 +229,7 @@ while(1) {
                # execute a function
                print STDERR "fastrpc: call $arg->{'module'}::$arg->{'func'}(",join(",", @{$arg->{'args'}}),")\n" if ($gconfig{'rpcdebug'});
                local @rv;
+               local $main::error_must_die = 1;
                eval {
                        @rv = &foreign_call($arg->{'module'},
                                            $arg->{'func'},

diff --git a/gpl-virtual-server/CHANGELOG b/gpl-virtual-server/CHANGELOG
index 24f9ab6..27cc7ef 100644 (file)
--- a/gpl-virtual-server/CHANGELOG
+++ b/gpl-virtual-server/CHANGELOG
@@ -316,3 +316,5 @@ If the system has a bonded interface but no ethernet, it will be detected as the
 The configuration check process now ensures that the system is setup to use itself as a DNS server, so that newly created domains will resolve.
 Added an option to the scheduled backup page to only send an email report when the backup fails, and an option to send email to domain owners as well.
 When a virtual server with anonymous FTP is created, the ProFTPd user (typically ftp) is added to the domain's Unix group. This allows anonymous FTP to work even when the domain's home directory is not world-readable.
+---- Changes since 3.41 ----
+In the server templates pages under Default domain owner limits, added a section for specifying the features that can be used by the server owner. Previously, these were always automatically determined based on the features initially enabled when the domain was created.

diff --git a/lpadmin/cups-lib.pl b/lpadmin/cups-lib.pl
index 6f6f6d0..57f195a 100644 (file)
--- a/lpadmin/cups-lib.pl
+++ b/lpadmin/cups-lib.pl
@@ -229,13 +229,14 @@ if ($prn{'default'}) {
        }
 
 # enable or disable
-local $enable = &has_command("enable");
+local $enable = &has_command("cupsenable") || &has_command("enable");
+local $disable = &has_command("cupsdisable") || &has_command("disable");
 if ($prn{'enabled'}) { $cmd = "$enable $esc"; }
 elsif ($prn{'enabled_why'}) {
        local $wesc = quotemeta($prn{'enabled_why'});
-       $cmd = "$enable $esc ; disable -r $wesc $esc";
+       $cmd = "$enable $esc ; $disable -r $wesc $esc";
        }
-else { $cmd = "$enable $esc ; disable $esc"; }
+else { $cmd = "$enable $esc ; $disable $esc"; }
 $out = &backquote_logged("$cmd 2>&1");
 
 # accepting or rejecting requests

diff --git a/majordomo/index.cgi b/majordomo/index.cgi
index 213cd39..c737a4e 100755 (executable)
--- a/majordomo/index.cgi
+++ b/majordomo/index.cgi
@@ -118,24 +118,20 @@ foreach $l (grep { $lcan{$_} || $lcan{"*"} } @lists) {
        push(@icons, "images/list.gif");
        }
 if (@links) {
-       print "<a href='create_form.cgi'>$text{'index_add'}</a>\n";
+       @crlinks = ( "<a href='create_form.cgi'>$text{'index_add'}</a>" );
        if (@links) {
-               print "&nbsp;&nbsp;\n";
-               print "<a href='digest_form.cgi'>$text{'index_digest'}</a>\n";
+               push(@crlinks, "<a href='digest_form.cgi'>$text{'index_digest'}</a>");
+               }
+       if ($access{'create'}) {
+               print &ui_links_row(\@crlinks);
                }
-       print "<br>\n";
        &icons_table(\@links, \@titles, \@icons, 5);
        }
 else {
        print "<b>$text{'index_none'}</b>.<p>\n";
        }
 if ($access{'create'}) {
-       print "<a href='create_form.cgi'>$text{'index_add'}</a>\n";
-       if (@links) {
-               print "&nbsp;&nbsp;\n";
-               print "<a href='digest_form.cgi'>$text{'index_digest'}</a>\n";
-               }
-       print "<p>\n";
+       print &ui_links_row(\@crlinks);
        }
 
 if ($access{'global'}) {

diff --git a/majordomo/lang/en b/majordomo/lang/en
index ef19430..dc84ea1 100644 (file)
--- a/majordomo/lang/en
+++ b/majordomo/lang/en
@@ -12,8 +12,8 @@ index_setupdesc=Majordomo has been installed on your system, but not setup prope
 index_owner=Owner email address
 index_setup=Setup Aliases
 index_none=You have no mailing lists defined
-index_add=Add a new mailing list
-index_digest=Add a new digest list
+index_add=Add a new mailing list.
+index_digest=Add a new digest list.
 index_global=Edit Majordomo Options
 index_globaldesc=Edit global Majordomo options that apply to all mailing lists
 index_return=mailing lists

diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl
index 37f0482..c8a3824 100644 (file)
--- a/mount/linux-lib.pl
+++ b/mount/linux-lib.pl
@@ -865,8 +865,8 @@ return @sup;
 sub fstype_name
 {
 local(%fsmap);
-%fsmap = ("ext2","Linux Native Filesystem",
-         "ext3","New Linux Native Filesystem",
+%fsmap = ("ext2","Old Linux Native Filesystem",
+         "ext3","Linux Native Filesystem",
          "minix","Minix Filesystem",
          "msdos","MS-DOS Filesystem",
          "nfs","Network Filesystem",

diff --git a/mysql/edit_dbase.cgi b/mysql/edit_dbase.cgi
index 02c8247..ef07cbf 100755 (executable)
--- a/mysql/edit_dbase.cgi
+++ b/mysql/edit_dbase.cgi
@@ -19,7 +19,7 @@ else {
 if ($access{'indexes'}) {
        @indexes = &list_indexes($in{'db'});
        }
-if ($mysql_version >= 5 && $access{'views'}) {
+if (&supports_views() && $access{'views'}) {
        @views = &list_views($in{'db'});
        }
 

diff --git a/session_login.cgi b/session_login.cgi
index 1eff59e..159478c 100755 (executable)
--- a/session_login.cgi
+++ b/session_login.cgi
@@ -49,7 +49,7 @@ elsif ($in{'timed_out'}) {
 print "$text{'session_prefix'}\n";
 print "<form action=$gconfig{'webprefix'}/session_login.cgi method=post>\n";
 print "<input type=hidden name=page value='".&html_escape($in{'page'})."'>\n";
-print "<table border width=40% class='loginform formsection'>\n";
+print "<table border width=40% class='loginform'>\n";
 print "<tr $tb> <td><b>$text{'session_header'}</b></td> </tr>\n";
 print "<tr $cb> <td align=center><table cellpadding=3>\n";
 if ($gconfig{'realname'}) {

diff --git a/status/ping-monitor.pl b/status/ping-monitor.pl
index c96378c..6d98ca1 100644 (file)
--- a/status/ping-monitor.pl
+++ b/status/ping-monitor.pl
@@ -12,7 +12,7 @@ return { 'up' => 0 } if (!$ip);
 if ($config{'pinger'}) {
        # Call a ping command
        local $cmd = $config{'pinger'} eq "linux" ?
-                       "ping -c 1 -t 1" : $config{'pinger'};
+                       "ping -c 1 -w $wait" : $config{'pinger'};
        local $rv = system("$cmd ".quotemeta($_[0]->{'host'}).
                           " >/dev/null 2>&1 </dev/null");
        return { 'up' => $rv ? 0 : 1 };

diff --git a/version b/version
index 890cbb7..0b73934 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-1.340
+1.350

diff --git a/zones/create_form.cgi b/zones/create_form.cgi
index 951a826..81982ea 100755 (executable)
--- a/zones/create_form.cgi
+++ b/zones/create_form.cgi
@@ -2,6 +2,7 @@
 # Shows a form for adding a new zone
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 use Socket;
 &ReadParse();
 $p = new Webmin::Page(undef, $text{'create_title'}, "create");

diff --git a/zones/create_zone.cgi b/zones/create_zone.cgi
index 646b863..49921bd 100755 (executable)
--- a/zones/create_zone.cgi
+++ b/zones/create_zone.cgi
@@ -2,6 +2,7 @@
 # Actually creates a new zone
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 &error_setup($text{'create_err'});
 &foreign_require("time", "time-lib.pl");

diff --git a/zones/edit_attr.cgi b/zones/edit_attr.cgi
index a5b1a67..7ada18b 100755 (executable)
--- a/zones/edit_attr.cgi
+++ b/zones/edit_attr.cgi
@@ -2,6 +2,7 @@
 # Show a form for editing a generic attribute or adding one
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/edit_fs.cgi b/zones/edit_fs.cgi
index 2d1e50e..f980c5d 100755 (executable)
--- a/zones/edit_fs.cgi
+++ b/zones/edit_fs.cgi
@@ -2,6 +2,7 @@
 # Show a form for editing a filesystem or adding one
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/edit_net.cgi b/zones/edit_net.cgi
index b4310d3..7636241 100755 (executable)
--- a/zones/edit_net.cgi
+++ b/zones/edit_net.cgi
@@ -2,6 +2,7 @@
 # Show a form for editing a network interface or adding one
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/edit_pkg.cgi b/zones/edit_pkg.cgi
index e4babee..308e432 100755 (executable)
--- a/zones/edit_pkg.cgi
+++ b/zones/edit_pkg.cgi
@@ -2,6 +2,7 @@
 # Show a form for editing a package directory or adding one
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/edit_rctl.cgi b/zones/edit_rctl.cgi
index 816fef1..7c7ba86 100755 (executable)
--- a/zones/edit_rctl.cgi
+++ b/zones/edit_rctl.cgi
@@ -2,6 +2,7 @@
 # Show a form for editing a resource control or adding one
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/edit_zone.cgi b/zones/edit_zone.cgi
index 2474584..3551eb0 100755 (executable)
--- a/zones/edit_zone.cgi
+++ b/zones/edit_zone.cgi
@@ -2,6 +2,7 @@
 # Shows the details of one zone, with links to make changes
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/forms-lib.pl b/zones/forms-lib.pl
index c5e6f3b..b9e1081 100644 (file)
--- a/zones/forms-lib.pl
+++ b/zones/forms-lib.pl
@@ -1,3 +1,5 @@
+use Webmin::All;
+
 # get_zone_form(&in, &zinfo)
 # Returns a form for editing a zone
 sub get_zone_form

diff --git a/zones/index.cgi b/zones/index.cgi
index f5529ca..cd8e614 100755 (executable)
--- a/zones/index.cgi
+++ b/zones/index.cgi
@@ -2,6 +2,7 @@
 # Shows all zones, with links to add more
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 
 $p = new Webmin::Page(undef, $module_info{'desc'}, "intro", 1, 1);
 $zn = &get_current_zone();

diff --git a/zones/save_attr.cgi b/zones/save_attr.cgi
index 7dbb3cf..932c133 100755 (executable)
--- a/zones/save_attr.cgi
+++ b/zones/save_attr.cgi
@@ -2,6 +2,7 @@
 # Update, add or delete a generic attribute
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/save_fs.cgi b/zones/save_fs.cgi
index 885e4ca..f77840e 100755 (executable)
--- a/zones/save_fs.cgi
+++ b/zones/save_fs.cgi
@@ -2,6 +2,7 @@
 # Update, add or delete a filesystem
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/save_net.cgi b/zones/save_net.cgi
index b2dbab1..ae843a0 100755 (executable)
--- a/zones/save_net.cgi
+++ b/zones/save_net.cgi
@@ -2,6 +2,7 @@
 # Update, add or delete a network interface
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/save_pkg.cgi b/zones/save_pkg.cgi
index 9989487..c892ccf 100755 (executable)
--- a/zones/save_pkg.cgi
+++ b/zones/save_pkg.cgi
@@ -2,6 +2,7 @@
 # Update, add or delete an inherited package directory
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/save_rctl.cgi b/zones/save_rctl.cgi
index 40cc71d..bb9fcb6 100755 (executable)
--- a/zones/save_rctl.cgi
+++ b/zones/save_rctl.cgi
@@ -2,6 +2,7 @@
 # Update, add or delete a resource control
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/save_zone.cgi b/zones/save_zone.cgi
index ac909ec..fc1162e 100755 (executable)
--- a/zones/save_zone.cgi
+++ b/zones/save_zone.cgi
@@ -2,6 +2,7 @@
 # Update, reboot or delete a zone
 
 require './zones-lib.pl';
+do 'forms-lib.pl';
 &ReadParse();
 $zinfo = &get_zone($in{'zone'});
 $zinfo || &error($text{'edit_egone'});

diff --git a/zones/zones-lib.pl b/zones/zones-lib.pl
index c3933ba..cf14f61 100644 (file)
--- a/zones/zones-lib.pl
+++ b/zones/zones-lib.pl
@@ -4,8 +4,6 @@
 do '../web-lib.pl';
 &init_config();
 do '../ui-lib.pl';
-do 'forms-lib.pl';
-use Webmin::All;
 &foreign_require("net", "net-lib.pl");
 &foreign_require("mount", "mount-lib.pl");