- stevesk@cvs.openbsd.org 2008/11/07 18:50:18
[nchan.c] add space to some log/debug messages for readability; ok djm@ markus@
This commit is contained in:
parent
e15fb09847
commit
b57fab6b0b
|
@ -7,6 +7,9 @@
|
||||||
- stevesk@cvs.openbsd.org 2008/11/07 00:42:12
|
- stevesk@cvs.openbsd.org 2008/11/07 00:42:12
|
||||||
[ssh-keygen.c]
|
[ssh-keygen.c]
|
||||||
spelling/typo in comment
|
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
|
20081105
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
|
@ -4899,4 +4902,4 @@
|
||||||
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
||||||
passwords between UnixWare and OpenServer they will still work. OK dtucker@
|
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 $
|
||||||
|
|
10
nchan.c
10
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.
|
* 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 (c->sock != -1) {
|
||||||
if (shutdown(c->sock, SHUT_WR) < 0)
|
if (shutdown(c->sock, SHUT_WR) < 0)
|
||||||
debug2("channel %d: chan_shutdown_write: "
|
debug2("channel %d: chan_shutdown_write: "
|
||||||
"shutdown() failed for fd%d: %.100s",
|
"shutdown() failed for fd %d: %.100s",
|
||||||
c->self, c->sock, strerror(errno));
|
c->self, c->sock, strerror(errno));
|
||||||
} else {
|
} else {
|
||||||
if (channel_close_fd(&c->wfd) < 0)
|
if (channel_close_fd(&c->wfd) < 0)
|
||||||
logit("channel %d: chan_shutdown_write: "
|
logit("channel %d: chan_shutdown_write: "
|
||||||
"close() failed for fd%d: %.100s",
|
"close() failed for fd %d: %.100s",
|
||||||
c->self, c->wfd, strerror(errno));
|
c->self, c->wfd, strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -510,13 +510,13 @@ chan_shutdown_read(Channel *c)
|
||||||
if (shutdown(c->sock, SHUT_RD) < 0
|
if (shutdown(c->sock, SHUT_RD) < 0
|
||||||
&& errno != ENOTCONN)
|
&& errno != ENOTCONN)
|
||||||
error("channel %d: chan_shutdown_read: "
|
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,
|
c->self, c->sock, c->istate, c->ostate,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
} else {
|
} else {
|
||||||
if (channel_close_fd(&c->rfd) < 0)
|
if (channel_close_fd(&c->rfd) < 0)
|
||||||
logit("channel %d: chan_shutdown_read: "
|
logit("channel %d: chan_shutdown_read: "
|
||||||
"close() failed for fd%d: %.100s",
|
"close() failed for fd %d: %.100s",
|
||||||
c->self, c->rfd, strerror(errno));
|
c->self, c->rfd, strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue