summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-08-05 12:40:11 +1000
committerDamien Miller <djm@mindrot.org>2006-08-05 12:40:11 +1000
commit9ab00b44c17c89955bad6bf105e89b21c51bbe8e (patch)
tree2ca106de8f3fa5f5f7d23da38503e4c12d1b2c1c
parentd783435315d8e604998925d5e47b663a500ed252 (diff)
- stevesk@cvs.openbsd.org 2006/08/04 20:46:05
[monitor.c session.c ssh-agent.c] spaces
-rw-r--r--ChangeLog5
-rw-r--r--monitor.c6
-rw-r--r--session.c4
-rw-r--r--ssh-agent.c4
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f48d236e..d37f894ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 NB. portable commit contains everything *except* removing includes.h, as 82 NB. portable commit contains everything *except* removing includes.h, as
83 that will take a fair bit more work as we move headers that are required 83 that will take a fair bit more work as we move headers that are required
84 for portability workarounds to defines.h. (also, this step wasn't "easy") 84 for portability workarounds to defines.h. (also, this step wasn't "easy")
85 - stevesk@cvs.openbsd.org 2006/08/04 20:46:05
86 [monitor.c session.c ssh-agent.c]
87 spaces
85 88
8620060804 8920060804
87 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 90 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5152,4 +5155,4 @@
5152 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5155 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5153 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5156 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5154 5157
5155$Id: ChangeLog,v 1.4452 2006/08/05 02:39:39 djm Exp $ 5158$Id: ChangeLog,v 1.4453 2006/08/05 02:40:11 djm Exp $
diff --git a/monitor.c b/monitor.c
index 595aae1a8..5df45ce45 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.85 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: monitor.c,v 1.86 2006/08/04 20:46:05 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1266,7 +1266,7 @@ mm_session_close(Session *s)
1266{ 1266{
1267 debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid); 1267 debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
1268 if (s->ttyfd != -1) { 1268 if (s->ttyfd != -1) {
1269 debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); 1269 debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd);
1270 session_pty_cleanup2(s); 1270 session_pty_cleanup2(s);
1271 } 1271 }
1272 s->used = 0; 1272 s->used = 0;
@@ -1326,7 +1326,7 @@ mm_answer_pty(int sock, Buffer *m)
1326 /* no need to dup() because nobody closes ptyfd */ 1326 /* no need to dup() because nobody closes ptyfd */
1327 s->ptymaster = s->ptyfd; 1327 s->ptymaster = s->ptyfd;
1328 1328
1329 debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd); 1329 debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd);
1330 1330
1331 return (0); 1331 return (0);
1332 1332
diff --git a/session.c b/session.c
index 1d63f9f50..1eb66f440 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.216 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: session.c,v 1.217 2006/08/04 20:46:05 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1598,7 +1598,7 @@ do_child(Session *s, const char *command)
1598 do_rc_files(s, shell); 1598 do_rc_files(s, shell);
1599 1599
1600 /* restore SIGPIPE for child */ 1600 /* restore SIGPIPE for child */
1601 signal(SIGPIPE, SIG_DFL); 1601 signal(SIGPIPE, SIG_DFL);
1602 1602
1603 if (options.use_login) { 1603 if (options.use_login) {
1604 launch_login(pw, hostname); 1604 launch_login(pw, hostname);
diff --git a/ssh-agent.c b/ssh-agent.c
index e43faae42..6bc1e541a 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.151 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.152 2006/08/04 20:46:05 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1015,7 +1015,7 @@ int
1015main(int ac, char **av) 1015main(int ac, char **av)
1016{ 1016{
1017 int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0; 1017 int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;
1018 int sock, fd, ch; 1018 int sock, fd, ch;
1019 u_int nalloc; 1019 u_int nalloc;
1020 char *shell, *format, *pidstr, *agentsocket = NULL; 1020 char *shell, *format, *pidstr, *agentsocket = NULL;
1021 fd_set *readsetp = NULL, *writesetp = NULL; 1021 fd_set *readsetp = NULL, *writesetp = NULL;