diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
| commit | 462c32cb8d7a451c999a3f1e7d00f9c89e96700c (patch) | |
| tree | eafe8a40bcffb53c6bb88d75ac823cdc99ac92fe /crypto/openssh/session.c | |
| parent | f83fab023465a81d3ae1a9b90bad97409ecd9d51 (diff) | |
| parent | 925f1fb7e466dbf645650dc4ea9d2a34e728ef9c (diff) | |
| download | src-462c32cb8d7a451c999a3f1e7d00f9c89e96700c.tar.gz src-462c32cb8d7a451c999a3f1e7d00f9c89e96700c.zip | |
Upgrade OpenSSH to 6.1p1.
Notes
Notes:
svn path=/head/; revision=240075
Diffstat (limited to 'crypto/openssh/session.c')
| -rw-r--r-- | crypto/openssh/session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 0f008134166f..57a3e18c2cbc 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.258 2010/11/25 04:10:09 djm Exp $ */ +/* $OpenBSD: session.c,v 1.260 2012/03/15 03:10:27 guenther Exp $ */ /* $FreeBSD$ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1406,7 +1406,7 @@ do_nologin(struct passwd *pw) struct stat sb; #ifdef HAVE_LOGIN_CAP - if (login_getcapbool(lc, "ignorenologin", 0) && pw->pw_uid) + if (login_getcapbool(lc, "ignorenologin", 0) || pw->pw_uid == 0) return; nl = login_getcapstr(lc, "nologin", def_nl, def_nl); #else @@ -2182,7 +2182,7 @@ session_break_req(Session *s) packet_get_int(); /* ignored */ packet_check_eom(); - if (s->ttyfd == -1 || tcsendbreak(s->ttyfd, 0) < 0) + if (s->ptymaster == -1 || tcsendbreak(s->ptymaster, 0) < 0) return 0; return 1; } |