diff options
| author | des <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
| commit | 45d0197dd79eceffb5bbc29f75199eb09af5a5f9 (patch) | |
| tree | 6c519c109631364b652faced88b665da4b6058ae /servconf.h | |
| parent | 31fac2f7108f657f455d571b94ed1a5c86d075b2 (diff) | |
| download | FreeBSD-src-45d0197dd79eceffb5bbc29f75199eb09af5a5f9.zip FreeBSD-src-45d0197dd79eceffb5bbc29f75199eb09af5a5f9.tar.gz | |
Vendor import of OpenSSH 6.5p1.
Diffstat (limited to 'servconf.h')
| -rw-r--r-- | servconf.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.109 2013/07/19 07:37:48 markus Exp $ */ +/* $OpenBSD: servconf.h,v 1.111 2013/12/05 01:16:41 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 */ @@ -201,6 +202,9 @@ struct connection_info { * Match sub-config and the main config, and must be sent from the * privsep slave to the privsep master. We use a macro to ensure all * the options are copied and the copies are done in the correct order. + * + * NB. an option must appear in servconf.c:copy_set_server_options() or + * COPY_MATCH_STRING_OPTS here but never both. */ #define COPY_MATCH_STRING_OPTS() do { \ M_CP_STROPT(banner); \ |
