1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
Index: usr.sbin/ypserv/yp_access.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ypserv/yp_access.c,v
retrieving revision 1.22
diff -u -I__FBSDID -r1.22 yp_access.c
--- usr.sbin/ypserv/yp_access.c 3 May 2003 21:06:42 -0000 1.22
+++ usr.sbin/ypserv/yp_access.c 31 May 2006 03:41:25 -0000
@@ -87,12 +87,6 @@
"ypproc_maplist"
};
-#ifdef TCP_WRAPPER
-void
-load_securenets(void)
-{
-}
-#else
struct securenet {
struct in_addr net;
struct in_addr mask;
@@ -177,7 +171,6 @@
fclose(fp);
}
-#endif
/*
* Access control functions.
@@ -219,11 +212,12 @@
#endif
{
struct sockaddr_in *rqhost;
- int status = 0;
+ int status_securenets = 0;
+#ifdef TCP_WRAPPER
+ int status_tcpwrap;
+#endif
static unsigned long oldaddr = 0;
-#ifndef TCP_WRAPPER
struct securenet *tmp;
-#endif
const char *yp_procedure = NULL;
char procbuf[50];
@@ -274,21 +268,34 @@
}
#ifdef TCP_WRAPPER
- status = hosts_ctl("ypserv", STRING_UNKNOWN,
+ status_tcpwrap = hosts_ctl("ypserv", STRING_UNKNOWN,
inet_ntoa(rqhost->sin_addr), "");
-#else
+#endif
tmp = securenets;
while (tmp) {
if (((rqhost->sin_addr.s_addr & ~tmp->mask.s_addr)
| tmp->net.s_addr) == rqhost->sin_addr.s_addr) {
- status = 1;
+ status_securenets = 1;
break;
}
tmp = tmp->next;
}
-#endif
- if (!status) {
+#ifdef TCP_WRAPPER
+ if (status_securenets == 0 || status_tcpwrap == 0) {
+#else
+ if (status_securenets == 0) {
+#endif
+ /*
+ * One of the following two events occured:
+ *
+ * (1) The /var/yp/securenets exists and the remote host does not
+ * match any of the networks specified in it.
+ * (2) The hosts.allow file has denied access and TCP_WRAPPER is
+ * defined.
+ *
+ * In either case deny access.
+ */
if (rqhost->sin_addr.s_addr != oldaddr) {
yp_error("connect from %s:%d to procedure %s refused",
inet_ntoa(rqhost->sin_addr),
|
