diff options
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/servconf.h b/servconf.h index dcd1c2ab8..fa48804ec 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.112 2014/01/29 06:18:35 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.114 2014/07/15 15:54:14 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -83,6 +83,7 @@ typedef struct { | |||
83 | int x11_use_localhost; /* If true, use localhost for fake X11 server. */ | 83 | int x11_use_localhost; /* If true, use localhost for fake X11 server. */ |
84 | char *xauth_location; /* Location of xauth program */ | 84 | char *xauth_location; /* Location of xauth program */ |
85 | int permit_tty; /* If false, deny pty allocation */ | 85 | int permit_tty; /* If false, deny pty allocation */ |
86 | int permit_user_rc; /* If false, deny ~/.ssh/rc execution */ | ||
86 | int strict_modes; /* If true, require string home dir modes. */ | 87 | int strict_modes; /* If true, require string home dir modes. */ |
87 | int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */ | 88 | int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */ |
88 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ | 89 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ |
@@ -91,7 +92,7 @@ typedef struct { | |||
91 | char *macs; /* Supported SSH2 macs. */ | 92 | char *macs; /* Supported SSH2 macs. */ |
92 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ | 93 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ |
93 | int protocol; /* Supported protocol versions. */ | 94 | int protocol; /* Supported protocol versions. */ |
94 | int gateway_ports; /* If true, allow remote connects to forwarded ports. */ | 95 | struct ForwardOptions fwd_opts; /* forwarding options */ |
95 | SyslogFacility log_facility; /* Facility for system logging. */ | 96 | SyslogFacility log_facility; /* Facility for system logging. */ |
96 | LogLevel log_level; /* Level for system logging. */ | 97 | LogLevel log_level; /* Level for system logging. */ |
97 | int rhosts_rsa_authentication; /* If true, permit rhosts RSA | 98 | int rhosts_rsa_authentication; /* If true, permit rhosts RSA |
@@ -126,6 +127,7 @@ typedef struct { | |||
126 | int use_login; /* If true, login(1) is used */ | 127 | int use_login; /* If true, login(1) is used */ |
127 | int compression; /* If true, compression is allowed */ | 128 | int compression; /* If true, compression is allowed */ |
128 | int allow_tcp_forwarding; /* One of FORWARD_* */ | 129 | int allow_tcp_forwarding; /* One of FORWARD_* */ |
130 | int allow_streamlocal_forwarding; /* One of FORWARD_* */ | ||
129 | int allow_agent_forwarding; | 131 | int allow_agent_forwarding; |
130 | u_int num_allow_users; | 132 | u_int num_allow_users; |
131 | char *allow_users[MAX_ALLOW_USERS]; | 133 | char *allow_users[MAX_ALLOW_USERS]; |