- markus@cvs.openbsd.org 2001/10/03 10:01:20

     [auth.c]
     use realpath() for homedir, too. from jinmei@isl.rdc.toshiba.co.jp

diff --git a/ChangeLog b/ChangeLog
index 90839699d2bcf20ca9b9e104544dd32c351c578c..078da736be618f10a6724c8a5a14a9733ca750db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@
    - stevesk@cvs.openbsd.org 2001/10/02 22:56:09
      [sshd.c]
      #include "channels.h" for channel_set_af()
+   - markus@cvs.openbsd.org 2001/10/03 10:01:20
+     [auth.c]
+     use realpath() for homedir, too. from jinmei@isl.rdc.toshiba.co.jp
 
 20011001
  - (stevesk) loginrec.c: fix type conversion problems exposed when using

diff --git a/auth.c b/auth.c
index 9d4f4abfe9d6495eafb90010c2e56ed0c58e7a9e..096fb32ae270c86b52cd2ef5ea85b54641f68c03 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.27 2001/07/11 18:26:15 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.28 2001/10/03 10:01:20 markus Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -363,7 +363,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
     char *err, size_t errlen)
 {
        uid_t uid = pw->pw_uid;
-       char buf[MAXPATHLEN];
+       char buf[MAXPATHLEN], homedir[MAXPATHLEN];
        char *cp;
        struct stat st;
 
@@ -372,6 +372,11 @@ 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;
+       }
 
        /* check the open file to avoid races */
        if (fstat(fileno(f), &st) < 0 ||
@@ -400,7 +405,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
                }
 
                /* If are passed the homedir then we can stop */
-               if (strcmp(pw->pw_dir, buf) == 0) {
+               if (strcmp(homedir, buf) == 0) {
                        debug3("secure_filename: terminating check at '%s'",
                            buf);
                        break;