- 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 7f48d23..d37f894 100644
--- 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
@@ -5152,4 +5155,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4452 2006/08/05 02:39:39 djm Exp $
+$Id: ChangeLog,v 1.4453 2006/08/05 02:40:11 djm Exp $
diff --git a/monitor.c b/monitor.c
index 595aae1..5df45ce 100644
--- 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 @@
{
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 @@
/* 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 1d63f9f..1eb66f4 100644
--- 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_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 e43faae..6bc1e54 100644
--- 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 @@
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;