summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--session.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57ddea6ff..b38b3ca08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@
17 [sftp.c] 17 [sftp.c]
18 unbreak ls in working directories that contains globbing characters in 18 unbreak ls in working directories that contains globbing characters in
19 their pathnames. bz#1655 reported by vgiffin AT apple.com 19 their pathnames. bz#1655 reported by vgiffin AT apple.com
20 - djm@cvs.openbsd.org 2010/06/18 03:16:03
21 [session.c]
22 Missing check for chroot_director == "none" (we already checked against
23 NULL); bz#1564 from Jan.Pechanec AT Sun.COM
20 24
2120100622 2520100622
22 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 26 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/session.c b/session.c
index b49d08d60..7e19299cb 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.253 2010/04/23 22:42:05 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.254 2010/06/18 03:16:03 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1819,7 +1819,8 @@ do_child(Session *s, const char *command)
1819#ifdef HAVE_LOGIN_CAP 1819#ifdef HAVE_LOGIN_CAP
1820 r = login_getcapbool(lc, "requirehome", 0); 1820 r = login_getcapbool(lc, "requirehome", 0);
1821#endif 1821#endif
1822 if (r || options.chroot_directory == NULL) 1822 if (r || options.chroot_directory == NULL ||
1823 strcasecmp(options.chroot_directory, "none") == 0)
1823 fprintf(stderr, "Could not chdir to home " 1824 fprintf(stderr, "Could not chdir to home "
1824 "directory %s: %s\n", pw->pw_dir, 1825 "directory %s: %s\n", pw->pw_dir,
1825 strerror(errno)); 1826 strerror(errno));