summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorKevin Steves <stevesk@cvs.openbsd.org>2006-08-01 23:36:13 +0000
committerKevin Steves <stevesk@cvs.openbsd.org>2006-08-01 23:36:13 +0000
commitbda1e149bb2d07f551f4fb18a8e57f7a4fde52c9 (patch)
tree44886ca58df75f399baaa558e4530f4d687a7c49 /usr.bin/ssh
parent8bca0b445803e5a882bac2c04ef075d7d4591fa8 (diff)
clean extra spaces
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/authfile.c4
-rw-r--r--usr.bin/ssh/channels.c4
-rw-r--r--usr.bin/ssh/progressmeter.c4
-rw-r--r--usr.bin/ssh/scard.c10
-rw-r--r--usr.bin/ssh/servconf.c6
-rw-r--r--usr.bin/ssh/ssh.c4
6 files changed, 16 insertions, 16 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 0f2ea36ba58..f415724d435 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: authfile.c,v 1.75 2006/08/01 23:36:11 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -195,7 +195,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
return 0;
}
fp = fdopen(fd, "w");
- if (fp == NULL ) {
+ if (fp == NULL) {
error("fdopen %s failed: %s.", filename, strerror(errno));
close(fd);
return 0;
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index b87e84e6f13..8e17b62f0de 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.263 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: channels.c,v 1.264 2006/08/01 23:36:11 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1049,7 +1049,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
return 0;
/* look for method: "NO AUTHENTICATION REQUIRED" */
for (found = 0, i = 2 ; i < nmethods + 2; i++) {
- if (p[i] == SSH_SOCKS5_NOAUTH ) {
+ if (p[i] == SSH_SOCKS5_NOAUTH) {
found = 1;
break;
}
diff --git a/usr.bin/ssh/progressmeter.c b/usr.bin/ssh/progressmeter.c
index b48d4376803..a2e41812cba 100644
--- a/usr.bin/ssh/progressmeter.c
+++ b/usr.bin/ssh/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.35 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.36 2006/08/01 23:36:12 stevesk Exp $ */
/*
* Copyright (c) 2003 Nils Nordman. All rights reserved.
*
@@ -163,7 +163,7 @@ refresh_progress_meter(void)
len = 0;
if (len >= file_len + 1)
len = file_len;
- for (i = len; i < file_len; i++ )
+ for (i = len; i < file_len; i++)
buf[i] = ' ';
buf[file_len] = '\0';
}
diff --git a/usr.bin/ssh/scard.c b/usr.bin/ssh/scard.c
index 0f79b4da0d6..f1e4d7f215e 100644
--- a/usr.bin/ssh/scard.c
+++ b/usr.bin/ssh/scard.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scard.c,v 1.33 2006/07/25 02:01:34 stevesk Exp $ */
+/* $OpenBSD: scard.c,v 1.34 2006/08/01 23:36:12 stevesk Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -127,7 +127,7 @@ sc_init(void)
if (status == SCARD_ERROR_NOCARD) {
return SCARD_ERROR_NOCARD;
}
- if (status < 0 ) {
+ if (status < 0) {
error("sc_open failed");
return status;
}
@@ -217,7 +217,7 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa,
olen = len = sw = 0;
if (sc_fd < 0) {
status = sc_init();
- if (status < 0 )
+ if (status < 0)
goto err;
}
if (padding != RSA_PKCS1_PADDING)
@@ -257,7 +257,7 @@ sc_private_encrypt(int flen, u_char *from, u_char *to, RSA *rsa,
len = sw = 0;
if (sc_fd < 0) {
status = sc_init();
- if (status < 0 )
+ if (status < 0)
goto err;
}
if (padding != RSA_PKCS1_PADDING)
@@ -380,7 +380,7 @@ sc_get_keys(const char *id, const char *pin)
key_free(k);
return NULL;
}
- if (status < 0 ) {
+ if (status < 0) {
error("sc_read_pubkey failed");
key_free(k);
return NULL;
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index e91526c394c..d0993c95a5e 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.162 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: servconf.c,v 1.163 2006/08/01 23:36:12 stevesk Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -920,7 +920,7 @@ parse_flag:
case sDenyUsers:
while ((arg = strdelim(&cp)) && *arg != '\0') {
if (options->num_deny_users >= MAX_DENY_USERS)
- fatal( "%s line %d: too many deny users.",
+ fatal("%s line %d: too many deny users.",
filename, linenum);
options->deny_users[options->num_deny_users++] =
xstrdup(arg);
@@ -1055,7 +1055,7 @@ parse_flag:
*/
case sAuthorizedKeysFile:
case sAuthorizedKeysFile2:
- charptr = (opcode == sAuthorizedKeysFile ) ?
+ charptr = (opcode == sAuthorizedKeysFile) ?
&options->authorized_keys_file :
&options->authorized_keys_file2;
goto parse_filename;
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index d8418b77973..a2066f1a9df 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.291 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: ssh.c,v 1.292 2006/08/01 23:36:12 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1208,7 +1208,7 @@ load_public_identity_files(void)
if (options.smartcard_device != NULL &&
options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
- (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) {
+ (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
int count = 0;
for (i = 0; keys[i] != NULL; i++) {
count++;