Better auto-hiding of inetd and xinetd modules

diff --git a/inetd/install_check.pl b/inetd/install_check.pl
new file mode 100644 (file)
index 0000000..8c762de
--- /dev/null
+++ b/inetd/install_check.pl
@@ -0,0 +1,14 @@
+# install_check.pl
+
+do 'inetd-lib.pl';
+
+# is_installed(mode)
+# For mode 1, returns 2 if the server is installed and configured for use by
+# Webmin, 1 if installed but not configured, or 0 otherwise.
+# For mode 0, returns 1 if installed, 0 if not
+sub is_installed
+{
+return 0 if (!-r $config{'inetd_conf_file'});
+return $_[0] ? 2 : 1;
+}
+

diff --git a/inetd/module.info b/inetd/module.info
index 1cdb4d8..6240a6b 100644 (file)
--- a/inetd/module.info
+++ b/inetd/module.info
@@ -9,7 +9,7 @@ desc_zh_CN=inetd 
 desc_pt=Serviços e Protocolos de Internet
 category=net
 desc_tr=Internet Servisleri ve Protokoller
-os_support=slackware-linux redhat-linux{-r "/etc/inetd.conf"} mandrake-linux{-r "/etc/inetd.conf"} solaris debian-linux suse-linux united-linux hpux freebsd unixware openserver osf1 macos open-linux turbo-linux openbsd corel-linux cobalt-linux lfs-linux aix netbsd msc-linux generic-linux gentoo-linux{-r "/etc/inetd.conf"} irix sol-linux coherent-linux
+os_support=solaris *-linux hpux freebsd unixware openserver osf1 macos openbsd netbsd irix
 desc=Internet Services and Protocols
 desc_es=Servicios y Protocolos de Internet
 desc_sv=Internettjänster och -protokoll

diff --git a/xinetd/module.info b/xinetd/module.info
index 3f0f3c4..6dd3f35 100644 (file)
--- a/xinetd/module.info
+++ b/xinetd/module.info
@@ -1,7 +1,6 @@
 category=net
 desc_ko_KR.euc=È®Àå ÀÎÅÍ³Ý ¼­ºñ½º
 risk=low medium high
-os_support={-r "/etc/xinetd.conf" || -x "/usr/sbin/xinetd" || -x "/sbin/xinetd" || -r "/usr/local/etc/xinetd.conf"}
 desc_pl=Rozszerzone us³ugi internetowe  (XInetd)
 desc=Extended Internet Services
 desc_es=Servicios Extendidos de Internet  (XInetd)