summaryrefslogtreecommitdiffstats
path: root/servconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-30 22:21:50 +1100
committerDamien Miller <djm@mindrot.org>2013-10-30 22:21:50 +1100
commit5ff30c6b68adeee767dd29bf2369763c6a13c0b3 (patch)
treeaf34775607e7ca5317884d5c2e8460f2782b0f43 /servconf.h
parent4a3a9d4bbf8048473f5cc202cd8db7164d5e6b8d (diff)
- 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@
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 98aad8ba..2d4b6ecb 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.109 2013/07/19 07:37:48 markus Exp $ */
+/* $OpenBSD: servconf.h,v 1.110 2013/10/29 09:48:02 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -82,6 +82,7 @@ typedef struct {
* searching at */
int x11_use_localhost; /* If true, use localhost for fake X11 server. */
char *xauth_location; /* Location of xauth program */
+ int permit_tty; /* If false, deny pty allocation */
int strict_modes; /* If true, require string home dir modes. */
int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */
int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */