Fix protocol detection

diff --git a/xinetd/config b/xinetd/config
index 518db97..7aa1829 100644 (file)
--- a/xinetd/config
+++ b/xinetd/config
@@ -2,3 +2,4 @@ xinetd_conf=/etc/xinetd.conf
 protocols_file=/etc/protocols
 pid_file=/var/run/xinetd.pid
 start_cmd=/usr/local/sbin/xinetd -pid 2>/var/run/xinetd.pid
+lookup_servs=1

diff --git a/xinetd/index.cgi b/xinetd/index.cgi
index 3036b52..9b8f077 100755 (executable)
--- a/xinetd/index.cgi
+++ b/xinetd/index.cgi
@@ -57,9 +57,20 @@ foreach $x (@conf) {
                        }
                }
        else {
-               # Only service specified, check all protocols
+               # Only service specified, check protocols based on socket type,
+               # or failing that all protocols
                if ($config{'lookup_servs'}) {
-                       foreach $p (&list_protocols()) {
+                       local @protos;
+                       if ($q->{'socket_type'}->[0] eq 'stream') {
+                               @protos = ( 'tcp' );
+                               }
+                       elsif ($q->{'socket_type'}->[0] eq 'dgram') {
+                               @protos = ( 'udp' );
+                               }
+                       else {
+                               @protos = &list_protocols();
+                               }
+                       foreach $p (@protos) {
                                @s = getservbyname($x->{'value'}, $p);
                                last if (@s);
                                }