From 5428f646ad32da88ddd04a8c287d595524674fbf Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 25 Nov 1999 11:54:57 +1100 Subject: - More reformatting merged from OpenBSD CVS - Merged OpenBSD CVS changes: - [channels.c] report from mrwizard@psu.edu via djm@ibs.com.au - [channels.c] set SO_REUSEADDR and SO_LINGER for forwarded ports. chip@valinux.com via damien@ibs.com.au - [nchan.c] it's not an error() if shutdown_write failes in nchan. - [readconf.c] remove dead #ifdef-0-code - [readconf.c servconf.c] strcasecmp instead of tolower - [scp.c] progress meter overflow fix from damien@ibs.com.au - [ssh-add.1 ssh-add.c] SSH_ASKPASS support - [ssh.1 ssh.c] postpone fork_after_authentication until command execution, request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au plus: use daemon() for backgrounding --- auth-rhosts.c | 57 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 23 deletions(-) (limited to 'auth-rhosts.c') diff --git a/auth-rhosts.c b/auth-rhosts.c index 500dcebb..2f12f134 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: auth-rhosts.c,v 1.5 1999/11/24 13:26:21 damien Exp $"); +RCSID("$Id: auth-rhosts.c,v 1.6 1999/11/25 00:54:57 damien Exp $"); #include "packet.h" #include "ssh.h" @@ -24,9 +24,11 @@ RCSID("$Id: auth-rhosts.c,v 1.5 1999/11/24 13:26:21 damien Exp $"); #include "uidswap.h" #include "servconf.h" -/* This function processes an rhosts-style file (.rhosts, .shosts, or - /etc/hosts.equiv). This returns true if authentication can be granted - based on the file, and returns zero otherwise. */ +/* + * This function processes an rhosts-style file (.rhosts, .shosts, or + * /etc/hosts.equiv). This returns true if authentication can be granted + * based on the file, and returns zero otherwise. + */ int check_rhosts_file(const char *filename, const char *hostname, @@ -41,7 +43,6 @@ check_rhosts_file(const char *filename, const char *hostname, if (!f) return 0; - /* Go through the file, checking every entry. */ while (fgets(buf, sizeof(buf), f)) { /* All three must be at least as big as buf to avoid overflows. */ char hostbuf[1024], userbuf[1024], dummy[1024], *host, *user, *cp; @@ -52,13 +53,17 @@ check_rhosts_file(const char *filename, const char *hostname, if (*cp == '#' || *cp == '\n' || !*cp) continue; - /* NO_PLUS is supported at least on OSF/1. We skip it (we - don't ever support the plus syntax). */ + /* + * NO_PLUS is supported at least on OSF/1. We skip it (we + * don't ever support the plus syntax). + */ if (strncmp(cp, "NO_PLUS", 7) == 0) continue; - /* This should be safe because each buffer is as big as - the whole string, and thus cannot be overwritten. */ + /* + * This should be safe because each buffer is as big as the + * whole string, and thus cannot be overwritten. + */ switch (sscanf(buf, "%s %s %s", hostbuf, userbuf, dummy)) { case 0: packet_send_debug("Found empty line in %.100s.", filename); @@ -135,10 +140,11 @@ check_rhosts_file(const char *filename, const char *hostname, return 0; } -/* Tries to authenticate the user using the .shosts or .rhosts file. - Returns true if authentication succeeds. If ignore_rhosts is - true, only /etc/hosts.equiv will be considered (.rhosts and .shosts - are ignored). */ +/* + * Tries to authenticate the user using the .shosts or .rhosts file. Returns + * true if authentication succeeds. If ignore_rhosts is true, only + * /etc/hosts.equiv will be considered (.rhosts and .shosts are ignored). + */ int auth_rhosts(struct passwd *pw, const char *client_user) @@ -150,11 +156,13 @@ auth_rhosts(struct passwd *pw, const char *client_user) static const char *rhosts_files[] = {".shosts", ".rhosts", NULL}; unsigned int rhosts_file_index; - /* Quick check: if the user has no .shosts or .rhosts files, - return failure immediately without doing costly lookups from - name servers. */ /* Switch to the user's uid. */ temporarily_use_uid(pw->pw_uid); + /* + * Quick check: if the user has no .shosts or .rhosts files, return + * failure immediately without doing costly lookups from name + * servers. + */ for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; rhosts_file_index++) { /* Check users .rhosts or .shosts. */ @@ -172,7 +180,6 @@ auth_rhosts(struct passwd *pw, const char *client_user) stat(SSH_HOSTS_EQUIV, &st) < 0) return 0; - /* Get the name, address, and port of the remote host. */ hostname = get_canonical_hostname(); ipaddr = get_remote_ipaddr(); @@ -191,8 +198,10 @@ auth_rhosts(struct passwd *pw, const char *client_user) return 1; } } - /* Check that the home directory is owned by root or the user, and - is not group or world writable. */ + /* + * Check that the home directory is owned by root or the user, and is + * not group or world writable. + */ if (stat(pw->pw_dir, &st) < 0) { log("Rhosts authentication refused for %.100s: no home directory %.200s", pw->pw_name, pw->pw_dir); @@ -221,10 +230,12 @@ auth_rhosts(struct passwd *pw, const char *client_user) if (stat(buf, &st) < 0) continue; - /* Make sure that the file is either owned by the user or - by root, and make sure it is not writable by anyone but - the owner. This is to help avoid novices accidentally - allowing access to their account by anyone. */ + /* + * Make sure that the file is either owned by the user or by + * root, and make sure it is not writable by anyone but the + * owner. This is to help avoid novices accidentally + * allowing access to their account by anyone. + */ if (options.strict_modes && ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || (st.st_mode & 022) != 0)) { -- cgit v1.2.1