summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-11 17:48:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-11 17:48:48 +0000
commitb07cd94e32d42ee002029aaaa1ed98b171e4edab (patch)
tree6b5b7497aa558f10572adc2375b74b24c2fda6e4 /usr.bin/ssh/ssh.c
parentb90b6524f3d1f0180fc4c2fba4ad23ea382e6150 (diff)
spaces
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index e77d87da969..bad9a829d37 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.222 2004/06/23 14:31:01 dtucker Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -546,7 +546,7 @@ again:
(void)read_config_file(buf, host, &options, 1);
/* Read systemwide configuration file after use config. */
- (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
+ (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
&options, 0);
}
@@ -1026,7 +1026,7 @@ ssh_control_listener(void)
{
struct sockaddr_un addr;
mode_t old_umask;
-
+
if (options.control_path == NULL || options.control_master <= 0)
return;
@@ -1238,7 +1238,7 @@ control_client(const char *path)
Buffer m;
char *cp;
extern char **environ;
-
+
memset(&addr, '\0', sizeof(addr));
addr.sun_family = AF_UNIX;
addr.sun_len = offsetof(struct sockaddr_un, sun_path) +
@@ -1279,13 +1279,13 @@ control_client(const char *path)
if (options.num_send_env == 0 || environ == NULL) {
buffer_put_int(&m, 0);
- } else {
+ } else {
/* Pass environment */
num_env = 0;
for (i = 0; environ[i] != NULL; i++)
if (env_permitted(environ[i]))
num_env++; /* Count */
-
+
buffer_put_int(&m, num_env);
for (i = 0; environ[i] != NULL && num_env >= 0; i++)