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 /misc.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 'misc.h')
| -rw-r--r-- | misc.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.99 2021/11/13 21:14:13 deraadt Exp $ */ +/* $OpenBSD: misc.h,v 1.100 2022/06/03 04:30:47 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -179,6 +179,8 @@ void child_set_env(char ***envp, u_int *envsizep, const char *name, const char *value); const char *lookup_env_in_list(const char *env, char * const *envs, size_t nenvs); +const char *lookup_setenv_in_list(const char *env, + char * const *envs, size_t nenvs); int argv_split(const char *, int *, char ***, int); char *argv_assemble(int, char **argv); |