7 files changed, 17 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 897eb13c2..30d73c556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
    - stevesk@cvs.openbsd.org 2007/01/03 00:53:38
      [ssh-keygen.c]
      remove small dead code; arnaud.lacombe.1@ulaval.ca via Coverity scan
+   - stevesk@cvs.openbsd.org 2007/01/03 03:01:40
+     [auth2-chall.c channels.c dns.c sftp.c ssh-keygen.c ssh.c]
+     spaces
 
 20061205
  - (djm) [auth.c] Fix NULL pointer dereference in fakepw().  Crash would
@@ -2652,4 +2655,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4599 2007/01/05 05:29:55 djm Exp $
+$Id: ChangeLog,v 1.4600 2007/01/05 05:30:16 djm Exp $
diff --git a/auth2-chall.c b/auth2-chall.c
index b78b739cd..51059c2bd 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.31 2006/08/05 08:28:24 dtucker Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.32 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -206,7 +206,7 @@ auth2_challenge_stop(Authctxt *authctxt)
 {
         /* unregister callback */
         dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
-        if (authctxt->kbdintctxt != NULL)  {
+        if (authctxt->kbdintctxt != NULL) {
                 kbdint_free(authctxt->kbdintctxt);
                 authctxt->kbdintctxt = NULL;
         }
diff --git a/channels.c b/channels.c
index 6be121970..9d522a6c3 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.267 2006/12/12 03:58:42 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.268 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1052,7 +1052,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
                 if (have < nmethods + 2)
                         return 0;
                 /* look for method: "NO AUTHENTICATION REQUIRED" */
-                for (found = 0, i = 2 ; i < nmethods + 2; i++) {
+                for (found = 0, i = 2; i < nmethods + 2; i++) {
                         if (p[i] == SSH_SOCKS5_NOAUTH) {
                                 found = 1;
                                 break;
diff --git a/dns.c b/dns.c
index 92623de72..a89176f88 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: dns.c,v 1.24 2007/01/03 03:01:40 stevesk Exp $ */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -217,7 +217,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
         if (fingerprints->rri_nrdatas)
                 *flags |= DNS_VERIFY_FOUND;
 
-        for (counter = 0; counter < fingerprints->rri_nrdatas; counter++)  {
+        for (counter = 0; counter < fingerprints->rri_nrdatas; counter++) {
                 /*
                  * Extract the key from the answer. Ignore any badly
                  * formatted fingerprints.
diff --git a/sftp.c b/sftp.c
index 990b0cbbd..c54333d82 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.94 2006/11/23 01:35:11 ray Exp $ */
+/* $OpenBSD: sftp.c,v 1.95 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1566,7 +1566,7 @@ main(int argc, char **argv)
                                 fprintf(stderr, "Missing username\n");
                                 usage();
                         }
-                        addargs(&args, "-l%s",userhost);
+                        addargs(&args, "-l%s", userhost);
                 }
 
                 if ((cp = colon(host)) != NULL) {
diff --git a/ssh-keygen.c b/ssh-keygen.c
index f43b12493..4c5b14005 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.157 2007/01/03 00:53:38 stevesk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.158 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -253,7 +253,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         i2 = buffer_get_int(&b);
         i3 = buffer_get_int(&b);
         i4 = buffer_get_int(&b);
-        debug("ignore (%d %d %d %d)", i1,i2,i3,i4);
+        debug("ignore (%d %d %d %d)", i1, i2, i3, i4);
         if (strcmp(cipher, "none") != 0) {
                 error("unsupported cipher %s", cipher);
                 xfree(cipher);
@@ -553,7 +553,7 @@ do_fingerprint(struct passwd *pw)
                         for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
                                 ;
                         if (!*cp || *cp == '\n' || *cp == '#')
-                                continue ;
+                                continue;
                         i = strtol(cp, &ep, 10);
                         if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {
                                 int quoted = 0;
diff --git a/ssh.c b/ssh.c
index 47297edbb..cfaa1ff22 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.294 2006/10/06 02:29:19 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.295 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -614,7 +614,7 @@ main(int ac, char **av)
                 if (!read_config_file(config, host, &options, 0))
                         fatal("Can't open user config file %.100s: "
                             "%.100s", config, strerror(errno));
-        } else  {
+        } else {
                 snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
                     _PATH_SSH_USER_CONFFILE);
                 (void)read_config_file(buf, host, &options, 1);