- stevesk@cvs.openbsd.org 2006/08/04 20:46:05

     [monitor.c session.c ssh-agent.c]
     spaces

diff --git a/ChangeLog b/ChangeLog
index 8dc197f5533124c78c647a7ef7538ba1303b261e..8298507a5686b749f4c43ed899cf6d53daa9ecdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
      NB. portable commit contains everything *except* removing includes.h, as
      that will take a fair bit more work as we move headers that are required
      for portability workarounds to defines.h. (also, this step wasn't "easy")
+   - stevesk@cvs.openbsd.org 2006/08/04 20:46:05
+     [monitor.c session.c ssh-agent.c]
+     spaces
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent

diff --git a/monitor.c b/monitor.c
index 595aae1a858845e9f56bc2519bb7047b54d9085d..5df45ce457b79dbbe948e7ce3b439f556a9fdde5 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.85 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: monitor.c,v 1.86 2006/08/04 20:46:05 stevesk Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1266,7 +1266,7 @@ mm_session_close(Session *s)
 {
        debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
        if (s->ttyfd != -1) {
-               debug3("%s: tty %s ptyfd %d",  __func__, s->tty, s->ptyfd);
+               debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd);
                session_pty_cleanup2(s);
        }
        s->used = 0;
@@ -1326,7 +1326,7 @@ mm_answer_pty(int sock, Buffer *m)
        /* no need to dup() because nobody closes ptyfd */
        s->ptymaster = s->ptyfd;
 
-       debug3("%s: tty %s ptyfd %d",  __func__, s->tty, s->ttyfd);
+       debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd);
 
        return (0);
 

diff --git a/session.c b/session.c
index 1d63f9f50b8df0b9754d24839c4a48e78daac132..1eb66f44061e89660df1374375dd7a2a44e1dcaa 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.216 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: session.c,v 1.217 2006/08/04 20:46:05 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1598,7 +1598,7 @@ do_child(Session *s, const char *command)
                do_rc_files(s, shell);
 
        /* restore SIGPIPE for child */
-       signal(SIGPIPE,  SIG_DFL);
+       signal(SIGPIPE, SIG_DFL);
 
        if (options.use_login) {
                launch_login(pw, hostname);

diff --git a/ssh-agent.c b/ssh-agent.c
index e43faae42b244d4ee242c69ab5322882b57a19b5..6bc1e541ae9f1f145d34b7f4a24f3167acfff429 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.151 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.152 2006/08/04 20:46:05 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1015,7 +1015,7 @@ int
 main(int ac, char **av)
 {
        int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;
-       int sock, fd,  ch;
+       int sock, fd, ch;
        u_int nalloc;
        char *shell, *format, *pidstr, *agentsocket = NULL;
        fd_set *readsetp = NULL, *writesetp = NULL;