diff options
author | djm@openbsd.org <djm@openbsd.org> | 2022-06-03 04:30:46 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2022-06-03 14:33:18 +1000 |
commit | 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40 (patch) | |
tree | 51a3beeb61487d6449266b91203118595ab376f0 /readconf.h | |
parent | 38ed6c57e9e592c08e020fa6e82b45b4e1040970 (diff) |
upstream: Make SetEnv directives first-match-wins in both
sshd_config and sshd_config; previously if the same name was reused then the
last would win (which is the opposite to how the config is supposed to work).
While there, make the ssh_config parsing more like sshd_config.
bz3438, ok dtucker
OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.146 2021/12/19 22:14:47 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.147 2022/06/03 04:30:47 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -124,10 +124,10 @@ typedef struct { int server_alive_interval; int server_alive_count_max; - int num_send_env; - char **send_env; - int num_setenv; - char **setenv; + u_int num_send_env; + char **send_env; + u_int num_setenv; + char **setenv; char *control_path; int control_master; |