summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-10-10 15:04:20 +1000
committerDamien Miller <djm@mindrot.org>2001-10-10 15:04:20 +1000
commitd3c04b90e478c664635d66fb4e07bb3236c62cc1 (patch)
tree998deffa64f60444e151682f1bb558006a116268
parent4623a754624624523ef2f50ba8647cad7f31d992 (diff)
- markus@cvs.openbsd.org 2001/10/08 11:48:57
[channels.c] better debug
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2271b76ff..bcfc4a8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 [channels.c channels.h] 25 [channels.c channels.h]
26 avoid possible FD_ISSET overflow for channels established 26 avoid possible FD_ISSET overflow for channels established
27 during channnel_after_select() (used for dynamic channels). 27 during channnel_after_select() (used for dynamic channels).
28 - markus@cvs.openbsd.org 2001/10/08 11:48:57
29 [channels.c]
30 better debug
28 31
2920011007 3220011007
30 - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. 33 - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.
@@ -6670,4 +6673,4 @@
6670 - Wrote replacements for strlcpy and mkdtemp 6673 - Wrote replacements for strlcpy and mkdtemp
6671 - Released 1.0pre1 6674 - Released 1.0pre1
6672 6675
6673$Id: ChangeLog,v 1.1592 2001/10/10 05:03:58 djm Exp $ 6676$Id: ChangeLog,v 1.1593 2001/10/10 05:04:20 djm Exp $
diff --git a/channels.c b/channels.c
index 1ec6074b5..aaa0ea579 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.137 2001/10/07 17:49:40 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.138 2001/10/08 11:48:57 markus Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -1140,7 +1140,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
1140 } else { 1140 } else {
1141 if (c->host_port == 0) { 1141 if (c->host_port == 0) {
1142 nextstate = SSH_CHANNEL_DYNAMIC; 1142 nextstate = SSH_CHANNEL_DYNAMIC;
1143 rtype = "direct-tcpip"; 1143 rtype = "dynamic-tcpip";
1144 } else { 1144 } else {
1145 nextstate = SSH_CHANNEL_OPENING; 1145 nextstate = SSH_CHANNEL_OPENING;
1146 rtype = "direct-tcpip"; 1146 rtype = "direct-tcpip";