diff options
author | Damien Miller <djm@mindrot.org> | 2001-07-14 12:21:34 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-07-14 12:21:34 +1000 |
commit | 0ae6e009c8c6c61e16407b906ee80714daf61037 (patch) | |
tree | b254c9f2d39169da828d2f864b3f2c606cb389a5 /auth.c | |
parent | 1b73448d6d6aaab3b2610197a57d0775bdd690fe (diff) |
- markus@cvs.openbsd.org 2001/07/11 18:26:15
[auth.c]
no need to call dirname(pw->pw_dir).
note that dirname(3) modifies its argument on some systems.
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.26 2001/06/27 04:48:52 markus Exp $"); +RCSID("$OpenBSD: auth.c,v 1.27 2001/07/11 18:26:15 markus Exp $"); #ifdef HAVE_LOGIN_H #include <login.h> @@ -363,13 +363,10 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, char *err, size_t errlen) { uid_t uid = pw->pw_uid; - char homedir[MAXPATHLEN]; char buf[MAXPATHLEN]; char *cp; struct stat st; - strlcpy(homedir, dirname(pw->pw_dir), sizeof(homedir)); - if (realpath(file, buf) == NULL) { snprintf(err, errlen, "realpath %s failed: %s", file, strerror(errno)); @@ -385,8 +382,6 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, return -1; } - debug3("secure_filename: terminating check at '%s'", homedir); - /* for each component of the canonical path, walking upwards */ for (;;) { if ((cp = dirname(buf)) == NULL) { @@ -395,10 +390,6 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, } strlcpy(buf, cp, sizeof(buf)); - /* If are passed the homedir then we can stop */ - if (strcmp(buf, homedir) == 0) - break; - debug3("secure_filename: checking '%s'", buf); if (stat(buf, &st) < 0 || (st.st_uid != 0 && st.st_uid != uid) || @@ -408,6 +399,12 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, return -1; } + /* If are passed the homedir then we can stop */ + if (strcmp(pw->pw_dir, buf) == 0) { + debug3("secure_filename: terminating check at '%s'", + buf); + break; + } /* * dirname should always complete with a "/" path, * but we can be paranoid and check for "." too |