diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
commit | eab78da6a54225de06271d9c8da650f04a55ed88 (patch) | |
tree | aa258ca77515939f6d89317ff67fbcb0bca08b24 /session.c | |
parent | a26f5de49df59322fde07f7be91b3e3969c9c238 (diff) | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs.
- Allow "PermitOpen none" to refuse all port-forwarding requests
(closes: #543683).
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.259 2011/10/24 02:13:13 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.260 2012/03/15 03:10:27 guenther 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 |
@@ -1390,7 +1390,7 @@ do_nologin(struct passwd *pw) | |||
1390 | struct stat sb; | 1390 | struct stat sb; |
1391 | 1391 | ||
1392 | #ifdef HAVE_LOGIN_CAP | 1392 | #ifdef HAVE_LOGIN_CAP |
1393 | if (login_getcapbool(lc, "ignorenologin", 0) && pw->pw_uid) | 1393 | if (login_getcapbool(lc, "ignorenologin", 0) || pw->pw_uid == 0) |
1394 | return; | 1394 | return; |
1395 | nl = login_getcapstr(lc, "nologin", def_nl, def_nl); | 1395 | nl = login_getcapstr(lc, "nologin", def_nl, def_nl); |
1396 | #else | 1396 | #else |