diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-06-03 06:30:46 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-06-03 06:33:18 +0200 |
| commit | 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40 (patch) | |
| tree | 51a3beeb61487d6449266b91203118595ab376f0 /mux.c | |
| parent | upstream: Add missing *-sk types to ssh-keyscan manpage. From (diff) | |
| download | openssh-22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40.tar.xz openssh-22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40.zip | |
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 'mux.c')
| -rw-r--r-- | mux.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.93 2022/05/05 00:55:11 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.94 2022/06/03 04:30:47 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -242,7 +242,8 @@ mux_master_control_cleanup_cb(struct ssh *ssh, int cid, void *unused) static int env_permitted(const char *env) { - int i, ret; + u_int i; + int ret; char name[1024], *cp; if ((cp = strchr(env, '=')) == NULL || cp == env) @@ -1865,9 +1866,9 @@ mux_client_request_session(int fd) struct sshbuf *m; char *e; const char *term = NULL; - u_int echar, rid, sid, esid, exitval, type, exitval_seen; + u_int i, echar, rid, sid, esid, exitval, type, exitval_seen; extern char **environ; - int r, i, rawmode; + int r, rawmode; debug3_f("entering"); |