aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/mux.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/mux.c')
-rw-r--r--crypto/openssh/mux.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/openssh/mux.c b/crypto/openssh/mux.c
index 176f035c86f5..3cb3876148aa 100644
--- a/crypto/openssh/mux.c
+++ b/crypto/openssh/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.92 2022/01/11 01:26:47 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>
*
@@ -240,9 +240,10 @@ mux_master_control_cleanup_cb(struct ssh *ssh, int cid, void *unused)
/* Check mux client environment variables before passing them to mux master. */
static int
-env_permitted(char *env)
+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");