diff options
author | guenther <> | 2016-05-23 00:08:23 +0000 |
---|---|---|
committer | guenther <> | 2016-05-23 00:08:23 +0000 |
commit | 482e5cd1b118cf0e45534687fd0cca2743dbd27b (patch) | |
tree | a19b9cbb92c4d88ceba243a24efe5c203d6287f9 /src | |
parent | 3830190ab90a6e6be6ac167eec0f63cca532ac90 (diff) | |
download | openbsd-482e5cd1b118cf0e45534687fd0cca2743dbd27b.tar.gz openbsd-482e5cd1b118cf0e45534687fd0cca2743dbd27b.tar.bz2 openbsd-482e5cd1b118cf0e45534687fd0cca2743dbd27b.zip |
Eliminate __check_rhosts_file and __rcmd_errstr: they were only used by
rlogind and rshd (remember them?)
ok deraadt@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/net/ruserok.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libc/net/ruserok.c b/src/lib/libc/net/ruserok.c index 9a0af43219..4218b419b7 100644 --- a/src/lib/libc/net/ruserok.c +++ b/src/lib/libc/net/ruserok.c | |||
@@ -55,9 +55,6 @@ PROTO_NORMAL(__ivaliduser_sa); | |||
55 | static int __icheckhost(struct sockaddr *, socklen_t, const char *); | 55 | static int __icheckhost(struct sockaddr *, socklen_t, const char *); |
56 | static char *__gethostloop(struct sockaddr *, socklen_t); | 56 | static char *__gethostloop(struct sockaddr *, socklen_t); |
57 | 57 | ||
58 | int __check_rhosts_file = 1; | ||
59 | char *__rcmd_errstr; | ||
60 | |||
61 | int | 58 | int |
62 | ruserok(const char *rhost, int superuser, const char *ruser, const char *luser) | 59 | ruserok(const char *rhost, int superuser, const char *ruser, const char *luser) |
63 | { | 60 | { |
@@ -128,7 +125,7 @@ again: | |||
128 | } | 125 | } |
129 | (void)fclose(hostf); | 126 | (void)fclose(hostf); |
130 | } | 127 | } |
131 | if (first == 1 && (__check_rhosts_file || superuser)) { | 128 | if (first == 1) { |
132 | int len; | 129 | int len; |
133 | 130 | ||
134 | first = 0; | 131 | first = 0; |
@@ -169,7 +166,6 @@ again: | |||
169 | cp = ".rhosts writable by other than owner"; | 166 | cp = ".rhosts writable by other than owner"; |
170 | /* If there were any problems, quit. */ | 167 | /* If there were any problems, quit. */ |
171 | if (cp) { | 168 | if (cp) { |
172 | __rcmd_errstr = cp; | ||
173 | (void)fclose(hostf); | 169 | (void)fclose(hostf); |
174 | return (-1); | 170 | return (-1); |
175 | } | 171 | } |