summaryrefslogtreecommitdiff
path: root/auth-rhosts.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
committerDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
commit9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch)
treef79317ab211f59181a61b526f566e9c8cfe70c73 /auth-rhosts.c
parent89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff)
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
Diffstat (limited to 'auth-rhosts.c')
-rw-r--r--auth-rhosts.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/auth-rhosts.c b/auth-rhosts.c
index 9ba64dbc3..cbceb6319 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rhosts.c,v 1.24 2001/06/23 15:12:17 itojun Exp $"); 17RCSID("$OpenBSD: auth-rhosts.c,v 1.25 2001/12/19 07:18:56 deraadt Exp $");
18 18
19#include "packet.h" 19#include "packet.h"
20#include "xmalloc.h" 20#include "xmalloc.h"
@@ -186,7 +186,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
186 * servers. 186 * servers.
187 */ 187 */
188 for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; 188 for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
189 rhosts_file_index++) { 189 rhosts_file_index++) {
190 /* Check users .rhosts or .shosts. */ 190 /* Check users .rhosts or .shosts. */
191 snprintf(buf, sizeof buf, "%.500s/%.100s", 191 snprintf(buf, sizeof buf, "%.500s/%.100s",
192 pw->pw_dir, rhosts_files[rhosts_file_index]); 192 pw->pw_dir, rhosts_files[rhosts_file_index]);
@@ -204,16 +204,16 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
204 204
205 /* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */ 205 /* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */
206 if (pw->pw_uid != 0) { 206 if (pw->pw_uid != 0) {
207 if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user, 207 if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr,
208 pw->pw_name)) { 208 client_user, pw->pw_name)) {
209 packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.", 209 packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.",
210 hostname, ipaddr); 210 hostname, ipaddr);
211 return 1; 211 return 1;
212 } 212 }
213 if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr, client_user, 213 if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr,
214 pw->pw_name)) { 214 client_user, pw->pw_name)) {
215 packet_send_debug("Accepted for %.100s [%.100s] by %.100s.", 215 packet_send_debug("Accepted for %.100s [%.100s] by %.100s.",
216 hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV); 216 hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV);
217 return 1; 217 return 1;
218 } 218 }
219 } 219 }
@@ -230,7 +230,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
230 } 230 }
231 if (options.strict_modes && 231 if (options.strict_modes &&
232 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || 232 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
233 (st.st_mode & 022) != 0)) { 233 (st.st_mode & 022) != 0)) {
234 log("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.", 234 log("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
235 pw->pw_name); 235 pw->pw_name);
236 packet_send_debug("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.", 236 packet_send_debug("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
@@ -242,7 +242,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
242 242
243 /* Check all .rhosts files (currently .shosts and .rhosts). */ 243 /* Check all .rhosts files (currently .shosts and .rhosts). */
244 for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; 244 for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
245 rhosts_file_index++) { 245 rhosts_file_index++) {
246 /* Check users .rhosts or .shosts. */ 246 /* Check users .rhosts or .shosts. */
247 snprintf(buf, sizeof buf, "%.500s/%.100s", 247 snprintf(buf, sizeof buf, "%.500s/%.100s",
248 pw->pw_dir, rhosts_files[rhosts_file_index]); 248 pw->pw_dir, rhosts_files[rhosts_file_index]);
@@ -257,7 +257,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
257 */ 257 */
258 if (options.strict_modes && 258 if (options.strict_modes &&
259 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || 259 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
260 (st.st_mode & 022) != 0)) { 260 (st.st_mode & 022) != 0)) {
261 log("Rhosts authentication refused for %.100s: bad modes for %.200s", 261 log("Rhosts authentication refused for %.100s: bad modes for %.200s",
262 pw->pw_name, buf); 262 pw->pw_name, buf);
263 packet_send_debug("Bad file modes for %.200s", buf); 263 packet_send_debug("Bad file modes for %.200s", buf);