From 5ff30c6b68adeee767dd29bf2369763c6a13c0b3 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 30 Oct 2013 22:21:50 +1100 Subject: - djm@cvs.openbsd.org 2013/10/29 09:48:02 [servconf.c servconf.h session.c sshd_config sshd_config.5] shd_config PermitTTY to disallow TTY allocation, mirroring the longstanding no-pty authorized_keys option; bz#2070, patch from Teran McKinney; ok markus@ --- session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'session.c') diff --git a/session.c b/session.c index 6e48a2fae..a0a0c2d9c 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.267 2013/10/14 21:20:52 djm Exp $ */ +/* $OpenBSD: session.c,v 1.268 2013/10/29 09:48:02 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -2062,7 +2062,7 @@ session_pty_req(Session *s) u_int len; int n_bytes; - if (no_pty_flag) { + if (no_pty_flag || !options.permit_tty) { debug("Allocating a pty not permitted for this authentication."); return 0; } -- cgit v1.2.3