Make editable service field the default

diff --git a/tcpwrappers/CHANGELOG b/tcpwrappers/CHANGELOG
index 79a90c8..95349ff 100644 (file)
--- a/tcpwrappers/CHANGELOG
+++ b/tcpwrappers/CHANGELOG
@@ -1,2 +1,4 @@
 ---- Changes since 1.420 ----
 First version of this module, for configuring IP access control for a range of servers.
+---- Changes since 1.510 ----
+Added a Module Config option to control if possible services are taken from inetd/xinetd, or always manually entered.

diff --git a/tcpwrappers/config b/tcpwrappers/config
index 3e51a1e..161d92a 100644 (file)
--- a/tcpwrappers/config
+++ b/tcpwrappers/config
@@ -1,2 +1,3 @@
 hosts_allow=/etc/hosts.allow
 hosts_deny=/etc/hosts.deny
+inetd_services=0

diff --git a/tcpwrappers/config.info b/tcpwrappers/config.info
index 405f79b..095d3f8 100644 (file)
--- a/tcpwrappers/config.info
+++ b/tcpwrappers/config.info
@@ -1,2 +1,3 @@
 hosts_allow=TCP wrappers allow file,0
 hosts_deny=TCP wrappers deny file,0
+inetd_services=Fetch possible services from inetd?,1,1-Yes,0-No

diff --git a/tcpwrappers/edit_rule.cgi b/tcpwrappers/edit_rule.cgi
index 805b379..24b3c29 100755 (executable)
--- a/tcpwrappers/edit_rule.cgi
+++ b/tcpwrappers/edit_rule.cgi
@@ -54,7 +54,7 @@ print &ui_hidden($in{'allow'} ? 'allow' : 'deny', 1),"\n";
 print &ui_table_start($text{'edit_header'}, "", 2);
 
 # Services
-if (@xservices) {
+if (@xservices && $config{'inetd_services'}) {
        # listed from (x)inetd
        print &ui_table_row($text{'edit_service'},
                &ui_select("service", \@services, \@xservices, 5, 1));