1*4882a593SmuzhiyunUpstream-Status: Backport
2*4882a593Smuzhiyun
3*4882a593Smuzhiyundiff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c
4*4882a593Smuzhiyun--- tcp_wrappers_7.6.orig/tcpdchk.c	2003-08-21 02:50:37.000000000 +0200
5*4882a593Smuzhiyun+++ tcp_wrappers_7.6/tcpdchk.c	2003-08-21 02:50:33.000000000 +0200
6*4882a593Smuzhiyun@@ -53,6 +53,24 @@
7*4882a593Smuzhiyun #include "inetcf.h"
8*4882a593Smuzhiyun #include "scaffold.h"
9*4882a593Smuzhiyun
10*4882a593Smuzhiyun+/* list of programs which are known to be linked with libwrap in debian */
11*4882a593Smuzhiyun+static const char *const libwrap_programs[] = {
12*4882a593Smuzhiyun+    "portmap", "mountd", "statd", "ugidd",
13*4882a593Smuzhiyun+    "redir", "rlinetd",
14*4882a593Smuzhiyun+    "sshd",
15*4882a593Smuzhiyun+    "atftpd",
16*4882a593Smuzhiyun+    "diald",
17*4882a593Smuzhiyun+    "esound",
18*4882a593Smuzhiyun+    "gdm", "gnome-session",
19*4882a593Smuzhiyun+    "icecast", "icecast_admin", "icecast_client", "icecast_source",
20*4882a593Smuzhiyun+    "mysqld",
21*4882a593Smuzhiyun+    "ntop",
22*4882a593Smuzhiyun+    "pptpd",
23*4882a593Smuzhiyun+    "rquotad",
24*4882a593Smuzhiyun+    "sendmail", "smail",
25*4882a593Smuzhiyun+    NULL
26*4882a593Smuzhiyun+};
27*4882a593Smuzhiyun+
28*4882a593Smuzhiyun  /*
29*4882a593Smuzhiyun   * Stolen from hosts_access.c...
30*4882a593Smuzhiyun   */
31*4882a593Smuzhiyun@@ -147,8 +165,8 @@
32*4882a593Smuzhiyun     /*
33*4882a593Smuzhiyun      * These are not run from inetd but may have built-in access control.
34*4882a593Smuzhiyun      */
35*4882a593Smuzhiyun-    inet_set("portmap", WR_NOT);
36*4882a593Smuzhiyun-    inet_set("rpcbind", WR_NOT);
37*4882a593Smuzhiyun+    for (c = 0; libwrap_programs[c]; c++)
38*4882a593Smuzhiyun+	inet_set(libwrap_programs[c], WR_YES);
39*4882a593Smuzhiyun
40*4882a593Smuzhiyun     /*
41*4882a593Smuzhiyun      * Check accessibility of access control files.
42