Xinetd cannot actually forward to IPv6
authorJamie Cameron <jcameron@webmin.com>
Mon, 1 Nov 2010 04:51:52 +0000 (21:51 -0700)
committerJamie Cameron <jcameron@webmin.com>
Mon, 1 Nov 2010 04:51:52 +0000 (21:51 -0700)
xinetd/index.cgi
xinetd/save_serv.cgi

index 9b8f077..95ad094 100755 (executable)
@@ -109,29 +109,20 @@ print "<input type=submit name=disable value='$text{'index_disable'}'>\n";
 print "</form>\n";
 
 print &ui_hr();
-print "<table>\n";
-print "<form action=edit_defaults.cgi>\n";
-print "<tr> <td><input type=submit value=\"$text{'index_defaults'}\"></td>\n";
-print "<td>$text{'index_defaultsmsg'} \n";
-print "</td> </tr>\n";
-print "</form>\n";
+
+print &ui_buttons_start();
+print &ui_buttons_row("edit_defaults.cgi", $text{'index_defaults'},
+                     $text{'index_defaultsmsg'});
 
 if ($pid = &is_xinetd_running()) {
-       print "<form action=restart.cgi>\n";
-       print "<input type=hidden name=pid value=$pid>\n";
-       print "<tr> <td><input type=submit value=\"$text{'index_apply'}\"></td>\n";
-       print "<td>$text{'index_applymsg'} \n";
-       print "</td></tr>\n";
-       print "</form>\n";
+       print &ui_buttons_row("restart.cgi", $text{'index_apply'},
+                             $text{'index_applymsg'});
        }
 else {
-       print "<form action=start.cgi>\n";
-       print "<tr> <td><input type=submit value=\"$text{'index_start'}\"></td>\n";
-       print "<td>$text{'index_startmsg'} \n";
-       print "</td> </tr>\n";
-       print "</form>\n";
+       print &ui_buttons_row("start.cgi", $text{'index_start'},
+                             $text{'index_startmsg'});
        }
-print "</table>\n";
+print &ui_buttons_end();
 
 &ui_print_footer("/", $text{'index'});
 
index 065a7b0..1f935bf 100755 (executable)
@@ -96,7 +96,7 @@ else {
                &set_member_value($xinet, 'redirect');
                }
        else {
-               &to_ipaddress($in{'rhost'}) || &to_ip6address($in{'rhost'}) ||
+               &to_ipaddress($in{'rhost'}) ||
                        &error($text{'serv_erhost'});
                $in{'rport'} =~ /^\d+$/ || &error($text{'serv_erport'});
                @type = grep { $_ ne 'INTERNAL' } @type;