diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | nchan.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -7,6 +7,9 @@ | |||
7 | - stevesk@cvs.openbsd.org 2008/11/07 00:42:12 | 7 | - stevesk@cvs.openbsd.org 2008/11/07 00:42:12 |
8 | [ssh-keygen.c] | 8 | [ssh-keygen.c] |
9 | spelling/typo in comment | 9 | spelling/typo in comment |
10 | - stevesk@cvs.openbsd.org 2008/11/07 18:50:18 | ||
11 | [nchan.c] | ||
12 | add space to some log/debug messages for readability; ok djm@ markus@ | ||
10 | 13 | ||
11 | 20081105 | 14 | 20081105 |
12 | - OpenBSD CVS Sync | 15 | - OpenBSD CVS Sync |
@@ -4899,4 +4902,4 @@ | |||
4899 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4902 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4900 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4903 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4901 | 4904 | ||
4902 | $Id: ChangeLog,v 1.5134 2008/11/11 05:31:43 dtucker Exp $ | 4905 | $Id: ChangeLog,v 1.5135 2008/11/11 05:32:25 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: nchan.c,v 1.61 2008/09/11 14:22:37 markus Exp $ */ | 1 | /* $OpenBSD: nchan.c,v 1.62 2008/11/07 18:50:18 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -486,12 +486,12 @@ chan_shutdown_write(Channel *c) | |||
486 | if (c->sock != -1) { | 486 | if (c->sock != -1) { |
487 | if (shutdown(c->sock, SHUT_WR) < 0) | 487 | if (shutdown(c->sock, SHUT_WR) < 0) |
488 | debug2("channel %d: chan_shutdown_write: " | 488 | debug2("channel %d: chan_shutdown_write: " |
489 | "shutdown() failed for fd%d: %.100s", | 489 | "shutdown() failed for fd %d: %.100s", |
490 | c->self, c->sock, strerror(errno)); | 490 | c->self, c->sock, strerror(errno)); |
491 | } else { | 491 | } else { |
492 | if (channel_close_fd(&c->wfd) < 0) | 492 | if (channel_close_fd(&c->wfd) < 0) |
493 | logit("channel %d: chan_shutdown_write: " | 493 | logit("channel %d: chan_shutdown_write: " |
494 | "close() failed for fd%d: %.100s", | 494 | "close() failed for fd %d: %.100s", |
495 | c->self, c->wfd, strerror(errno)); | 495 | c->self, c->wfd, strerror(errno)); |
496 | } | 496 | } |
497 | } | 497 | } |
@@ -510,13 +510,13 @@ chan_shutdown_read(Channel *c) | |||
510 | if (shutdown(c->sock, SHUT_RD) < 0 | 510 | if (shutdown(c->sock, SHUT_RD) < 0 |
511 | && errno != ENOTCONN) | 511 | && errno != ENOTCONN) |
512 | error("channel %d: chan_shutdown_read: " | 512 | error("channel %d: chan_shutdown_read: " |
513 | "shutdown() failed for fd%d [i%d o%d]: %.100s", | 513 | "shutdown() failed for fd %d [i%d o%d]: %.100s", |
514 | c->self, c->sock, c->istate, c->ostate, | 514 | c->self, c->sock, c->istate, c->ostate, |
515 | strerror(errno)); | 515 | strerror(errno)); |
516 | } else { | 516 | } else { |
517 | if (channel_close_fd(&c->rfd) < 0) | 517 | if (channel_close_fd(&c->rfd) < 0) |
518 | logit("channel %d: chan_shutdown_read: " | 518 | logit("channel %d: chan_shutdown_read: " |
519 | "close() failed for fd%d: %.100s", | 519 | "close() failed for fd %d: %.100s", |
520 | c->self, c->rfd, strerror(errno)); | 520 | c->self, c->rfd, strerror(errno)); |
521 | } | 521 | } |
522 | } | 522 | } |