summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-11-11 16:32:25 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-11-11 16:32:25 +1100
commitb57fab6b0b7b30d279bea89409a684b2793fd924 (patch)
tree39ed8ce44d52d516466fe496fa2652b2094e0f7f
parente15fb09847aca6ffaed30eb443e97d82930d509c (diff)
downloadopenssh-git-b57fab6b0b7b30d279bea89409a684b2793fd924.tar.gz
- stevesk@cvs.openbsd.org 2008/11/07 18:50:18
[nchan.c] add space to some log/debug messages for readability; ok djm@ markus@
-rw-r--r--ChangeLog5
-rw-r--r--nchan.c10
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ddc512f..e3a7190e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
- stevesk@cvs.openbsd.org 2008/11/07 00:42:12
[ssh-keygen.c]
spelling/typo in comment
+ - stevesk@cvs.openbsd.org 2008/11/07 18:50:18
+ [nchan.c]
+ add space to some log/debug messages for readability; ok djm@ markus@
20081105
- OpenBSD CVS Sync
@@ -4899,4 +4902,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.5134 2008/11/11 05:31:43 dtucker Exp $
+$Id: ChangeLog,v 1.5135 2008/11/11 05:32:25 dtucker Exp $
diff --git a/nchan.c b/nchan.c
index b78d6a76..160445e5 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.61 2008/09/11 14:22:37 markus Exp $ */
+/* $OpenBSD: nchan.c,v 1.62 2008/11/07 18:50:18 stevesk Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -486,12 +486,12 @@ chan_shutdown_write(Channel *c)
if (c->sock != -1) {
if (shutdown(c->sock, SHUT_WR) < 0)
debug2("channel %d: chan_shutdown_write: "
- "shutdown() failed for fd%d: %.100s",
+ "shutdown() failed for fd %d: %.100s",
c->self, c->sock, strerror(errno));
} else {
if (channel_close_fd(&c->wfd) < 0)
logit("channel %d: chan_shutdown_write: "
- "close() failed for fd%d: %.100s",
+ "close() failed for fd %d: %.100s",
c->self, c->wfd, strerror(errno));
}
}
@@ -510,13 +510,13 @@ chan_shutdown_read(Channel *c)
if (shutdown(c->sock, SHUT_RD) < 0
&& errno != ENOTCONN)
error("channel %d: chan_shutdown_read: "
- "shutdown() failed for fd%d [i%d o%d]: %.100s",
+ "shutdown() failed for fd %d [i%d o%d]: %.100s",
c->self, c->sock, c->istate, c->ostate,
strerror(errno));
} else {
if (channel_close_fd(&c->rfd) < 0)
logit("channel %d: chan_shutdown_read: "
- "close() failed for fd%d: %.100s",
+ "close() failed for fd %d: %.100s",
c->self, c->rfd, strerror(errno));
}
}