diff options
| author |   guenther <guenther@openbsd.org> | 2016-05-23 00:08:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2016-05-23 00:08:23 +0000 |
| commit | e3b47d8ec43f1e35e2cc25a58bfaa39a7f63a39a (patch) | |
| tree | 3c4d8d6a41084df12b68064071fd28248eba54ac | |
| parent | Change openprom into a pseudo-device, because not all arm platforms (diff) | |
| download | wireguard-openbsd-e3b47d8ec43f1e35e2cc25a58bfaa39a7f63a39a.tar.xz wireguard-openbsd-e3b47d8ec43f1e35e2cc25a58bfaa39a7f63a39a.zip | |
Eliminate __check_rhosts_file and __rcmd_errstr: they were only used by
rlogind and rshd (remember them?)
ok deraadt@
| -rw-r--r-- | lib/libc/Symbols.list | 2 | ||||
| -rw-r--r-- | lib/libc/net/ruserok.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/libc/Symbols.list b/lib/libc/Symbols.list index 0c1b9e71c18..21964a299fe 100644 --- a/lib/libc/Symbols.list +++ b/lib/libc/Symbols.list @@ -997,7 +997,6 @@ res_send_async /* net */ __b64_ntop __b64_pton -/*__check_rhosts_file*/ __dn_comp __dn_skipname __ivaliduser @@ -1008,7 +1007,6 @@ __p_type __p_type_syms __putlong __putshort -__rcmd_errstr __res_dnok __res_hnok __res_mailok 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); } |