tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/11/04 10:07:53

Browse Source 
[auth.c]
     don't compare against pw_home if realpath fails for pw_home (seen
     on AFS); ok djm@
This commit is contained in:
Ben Lindstrom 2002-11-09 15:45:12 +00:00
parent ee844912c9
commit 485075e8fa
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -9,6 +9,10 @@
- markus@cvs.openbsd.org 2002/10/23 10:40:16 - markus@cvs.openbsd.org 2002/10/23 10:40:16
[bufaux.c] [bufaux.c]
%u for u_int %u for u_int
- 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@
20021021 20021021
- (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@ -786,4 +790,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2502 2002/11/09 15:43:23 mouring Exp $ $Id: ChangeLog,v 1.2503 2002/11/09 15:45:12 mouring Exp $

12
auth.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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 #ifdef HAVE_LOGIN_H
#include <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; uid_t uid = pw->pw_uid;
char buf[MAXPATHLEN], homedir[MAXPATHLEN]; char buf[MAXPATHLEN], homedir[MAXPATHLEN];
char *cp; char *cp;
int comparehome = 0;
struct stat st; struct stat st;
if (realpath(file, buf) == NULL) { if (realpath(file, buf) == NULL) {
@ -430,11 +431,8 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
strerror(errno)); strerror(errno));
return -1; return -1;
} }
if (realpath(pw->pw_dir, homedir) == NULL) { if (realpath(pw->pw_dir, homedir) != NULL)
snprintf(err, errlen, "realpath %s failed: %s", pw->pw_dir, comparehome = 1;
strerror(errno));
return -1;
}
/* check the open file to avoid races */ /* check the open file to avoid races */
if (fstat(fileno(f), &st) < 0 || 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 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'", debug3("secure_filename: terminating check at '%s'",
buf); buf);
break; break;