From cc1925187800cd7a5d9ef754e66e54471d53ddd3 Mon Sep 17 00:00:00 2001 From: dtucker Date: Wed, 23 Jun 2004 14:31:01 +0000 Subject: Fix counting in master/slave when passing environment variables; ok djm@ --- usr.bin/ssh/ssh.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'usr.bin/ssh/ssh.c') diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 1a552f5f76b..e77d87da969 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.221 2004/06/21 17:36:31 avsm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $"); #include #include @@ -1288,9 +1288,11 @@ control_client(const char *path) buffer_put_int(&m, num_env); - for (i = 0; environ[i] != NULL && num_env >= 0; i++, num_env--) - if (env_permitted(environ[i])) + for (i = 0; environ[i] != NULL && num_env >= 0; i++) + if (env_permitted(environ[i])) { + num_env--; buffer_put_cstring(&m, environ[i]); + } } if (ssh_msg_send(sock, /* version */0, &m) == -1) -- cgit v1.2.3-59-g8ed1b