diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
commit | fc9597034b819b295966f61d8dc797b53fda45c7 (patch) | |
tree | a5a9b7afc50720d7b6f89a4ae1f211abbff89f47 /ssh.c | |
parent | ba6de952a00558e6d93b8c9edd81806a99716411 (diff) |
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
sshd.c ttymodes.h]
spaces
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -551,7 +551,7 @@ again: | |||
551 | (void)read_config_file(buf, host, &options, 1); | 551 | (void)read_config_file(buf, host, &options, 1); |
552 | 552 | ||
553 | /* Read systemwide configuration file after use config. */ | 553 | /* Read systemwide configuration file after use config. */ |
554 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, | 554 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, |
555 | &options, 0); | 555 | &options, 0); |
556 | } | 556 | } |
557 | 557 | ||
@@ -1250,7 +1250,7 @@ control_client(const char *path) | |||
1250 | Buffer m; | 1250 | Buffer m; |
1251 | char *cp; | 1251 | char *cp; |
1252 | extern char **environ; | 1252 | extern char **environ; |
1253 | 1253 | ||
1254 | memset(&addr, '\0', sizeof(addr)); | 1254 | memset(&addr, '\0', sizeof(addr)); |
1255 | addr.sun_family = AF_UNIX; | 1255 | addr.sun_family = AF_UNIX; |
1256 | addr_len = offsetof(struct sockaddr_un, sun_path) + | 1256 | addr_len = offsetof(struct sockaddr_un, sun_path) + |
@@ -1291,13 +1291,13 @@ control_client(const char *path) | |||
1291 | 1291 | ||
1292 | if (options.num_send_env == 0 || environ == NULL) { | 1292 | if (options.num_send_env == 0 || environ == NULL) { |
1293 | buffer_put_int(&m, 0); | 1293 | buffer_put_int(&m, 0); |
1294 | } else { | 1294 | } else { |
1295 | /* Pass environment */ | 1295 | /* Pass environment */ |
1296 | num_env = 0; | 1296 | num_env = 0; |
1297 | for (i = 0; environ[i] != NULL; i++) | 1297 | for (i = 0; environ[i] != NULL; i++) |
1298 | if (env_permitted(environ[i])) | 1298 | if (env_permitted(environ[i])) |
1299 | num_env++; /* Count */ | 1299 | num_env++; /* Count */ |
1300 | 1300 | ||
1301 | buffer_put_int(&m, num_env); | 1301 | buffer_put_int(&m, num_env); |
1302 | 1302 | ||
1303 | for (i = 0; environ[i] != NULL && num_env >= 0; i++) | 1303 | for (i = 0; environ[i] != NULL && num_env >= 0; i++) |