- djm@cvs.openbsd.org 2010/06/18 03:16:03

[session.c]
     Missing check for chroot_director == "none" (we already checked against
     NULL); bz#1564 from Jan.Pechanec AT Sun.COM
This commit is contained in:
Damien Miller 2010-06-26 09:37:57 +10:00
parent 99ac4e9546
commit 7aa46ec393
2 changed files with 7 additions and 2 deletions

View File

@ -17,6 +17,10 @@
[sftp.c] [sftp.c]
unbreak ls in working directories that contains globbing characters in unbreak ls in working directories that contains globbing characters in
their pathnames. bz#1655 reported by vgiffin AT apple.com their pathnames. bz#1655 reported by vgiffin AT apple.com
- djm@cvs.openbsd.org 2010/06/18 03:16:03
[session.c]
Missing check for chroot_director == "none" (we already checked against
NULL); bz#1564 from Jan.Pechanec AT Sun.COM
20100622 20100622
- (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512

View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.253 2010/04/23 22:42:05 djm Exp $ */ /* $OpenBSD: session.c,v 1.254 2010/06/18 03:16:03 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1819,7 +1819,8 @@ do_child(Session *s, const char *command)
#ifdef HAVE_LOGIN_CAP #ifdef HAVE_LOGIN_CAP
r = login_getcapbool(lc, "requirehome", 0); r = login_getcapbool(lc, "requirehome", 0);
#endif #endif
if (r || options.chroot_directory == NULL) if (r || options.chroot_directory == NULL ||
strcasecmp(options.chroot_directory, "none") == 0)
fprintf(stderr, "Could not chdir to home " fprintf(stderr, "Could not chdir to home "
"directory %s: %s\n", pw->pw_dir, "directory %s: %s\n", pw->pw_dir,
strerror(errno)); strerror(errno));