summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d2358bda9..023fde0cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - mouring@cvs.openbsd.org 2004/06/23 00:39:38 16 - mouring@cvs.openbsd.org 2004/06/23 00:39:38
17 [rijndael.c] 17 [rijndael.c]
18 -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ 18 -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@
19 - dtucker@cvs.openbsd.org 2004/06/23 14:31:01
20 [ssh.c]
21 Fix counting in master/slave when passing environment variables; ok djm@
19 - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match 22 - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match
20 -Wshadow change. 23 -Wshadow change.
21 - (bal) [Makefile.in] Remove opensshd.init on 'make distclean' 24 - (bal) [Makefile.in] Remove opensshd.init on 'make distclean'
@@ -1396,4 +1399,4 @@
1396 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1399 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1397 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1400 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1398 1401
1399$Id: ChangeLog,v 1.3442 2004/06/23 14:33:48 dtucker Exp $ 1402$Id: ChangeLog,v 1.3443 2004/06/23 14:34:53 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 9e3f73555..767d99ca9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.221 2004/06/21 17:36:31 avsm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -1304,9 +1304,11 @@ control_client(const char *path)
1304 1304
1305 buffer_put_int(&m, num_env); 1305 buffer_put_int(&m, num_env);
1306 1306
1307 for (i = 0; environ[i] != NULL && num_env >= 0; i++, num_env--) 1307 for (i = 0; environ[i] != NULL && num_env >= 0; i++)
1308 if (env_permitted(environ[i])) 1308 if (env_permitted(environ[i])) {
1309 num_env--;
1309 buffer_put_cstring(&m, environ[i]); 1310 buffer_put_cstring(&m, environ[i]);
1311 }
1310 } 1312 }
1311 1313
1312 if (ssh_msg_send(sock, /* version */0, &m) == -1) 1314 if (ssh_msg_send(sock, /* version */0, &m) == -1)