diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-11-09 15:45:12 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-11-09 15:45:12 +0000 |
commit | 485075e8faf48c34c930446dc3f3905465941d56 (patch) | |
tree | 58dcb85975c7d407171f17f596b87b72dfbd414d /auth.c | |
parent | ee844912c94226a09c95e4140c158d9c4f37a0b5 (diff) | |
download | openssh-git-485075e8faf48c34c930446dc3f3905465941d56.tar.gz |
- markus@cvs.openbsd.org 2002/11/04 10:07:53
[auth.c]
don't compare against pw_home if realpath fails for pw_home (seen
on AFS); ok djm@
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.45 2002/09/20 18:41:29 stevesk Exp $"); +RCSID("$OpenBSD: auth.c,v 1.46 2002/11/04 10:07:53 markus Exp $"); #ifdef HAVE_LOGIN_H #include <login.h> @@ -423,6 +423,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, uid_t uid = pw->pw_uid; char buf[MAXPATHLEN], homedir[MAXPATHLEN]; char *cp; + int comparehome = 0; struct stat st; if (realpath(file, buf) == NULL) { @@ -430,11 +431,8 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, strerror(errno)); return -1; } - if (realpath(pw->pw_dir, homedir) == NULL) { - snprintf(err, errlen, "realpath %s failed: %s", pw->pw_dir, - strerror(errno)); - return -1; - } + if (realpath(pw->pw_dir, homedir) != NULL) + comparehome = 1; /* check the open file to avoid races */ if (fstat(fileno(f), &st) < 0 || @@ -463,7 +461,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, } /* If are passed the homedir then we can stop */ - if (strcmp(homedir, buf) == 0) { + if (comparehome && strcmp(homedir, buf) == 0) { debug3("secure_filename: terminating check at '%s'", buf); break; |