summaryrefslogtreecommitdiff
path: root/lib/libc/net
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2016-05-23 00:08:24 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2016-05-23 00:08:24 +0000
commit3913f00618011b83d45291dc3e1d7a80ffc81cb2 (patch)
treebeb3e9889c9444a3874582089d0a0bb89549df3a /lib/libc/net
parent07d66e3bf12fb3f13aa218794dd1012e2ca74882 (diff)
Eliminate __check_rhosts_file and __rcmd_errstr: they were only used by
rlogind and rshd (remember them?) ok deraadt@
Diffstat (limited to 'lib/libc/net')
-rw-r--r--lib/libc/net/ruserok.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/libc/net/ruserok.c b/lib/libc/net/ruserok.c
index 9a0af432192..4218b419b76 100644
--- a/lib/libc/net/ruserok.c
+++ b/lib/libc/net/ruserok.c
@@ -55,9 +55,6 @@ PROTO_NORMAL(__ivaliduser_sa);
static int __icheckhost(struct sockaddr *, socklen_t, const char *);
static char *__gethostloop(struct sockaddr *, socklen_t);
-int __check_rhosts_file = 1;
-char *__rcmd_errstr;
-
int
ruserok(const char *rhost, int superuser, const char *ruser, const char *luser)
{
@@ -128,7 +125,7 @@ again:
}
(void)fclose(hostf);
}
- if (first == 1 && (__check_rhosts_file || superuser)) {
+ if (first == 1) {
int len;
first = 0;
@@ -169,7 +166,6 @@ again:
cp = ".rhosts writable by other than owner";
/* If there were any problems, quit. */
if (cp) {
- __rcmd_errstr = cp;
(void)fclose(hostf);
return (-1);
}