summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--clientloop.c2
-rw-r--r--serverloop.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cbf5a0851..f38985992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,8 @@
115 - dtucker@cvs.openbsd.org 2008/06/12 16:35:31 115 - dtucker@cvs.openbsd.org 2008/06/12 16:35:31
116 [ssh_config.5 ssh.c] 116 [ssh_config.5 ssh.c]
117 keyword expansion for localcommand. ok djm@ 117 keyword expansion for localcommand. ok djm@
118 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
119 takes 2 more args. with djm@
118 120
11920080611 12120080611
120 - (djm) [channels.c configure.ac] 122 - (djm) [channels.c configure.ac]
@@ -4277,4 +4279,4 @@
4277 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4279 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4278 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4280 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4279 4281
4280$Id: ChangeLog,v 1.4985 2008/06/12 18:56:37 dtucker Exp $ 4282$Id: ChangeLog,v 1.4986 2008/06/12 19:09:18 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index d2407ed7e..62adbb78e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1745,7 +1745,7 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun)
1745#if defined(SSH_TUN_FILTER) 1745#if defined(SSH_TUN_FILTER)
1746 if (options.tun_open == SSH_TUNMODE_POINTOPOINT) 1746 if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
1747 channel_register_filter(c->self, sys_tun_infilter, 1747 channel_register_filter(c->self, sys_tun_infilter,
1748 sys_tun_outfilter); 1748 sys_tun_outfilter, NULL, NULL);
1749#endif 1749#endif
1750 1750
1751 packet_start(SSH2_MSG_CHANNEL_OPEN); 1751 packet_start(SSH2_MSG_CHANNEL_OPEN);
diff --git a/serverloop.c b/serverloop.c
index 76d76bab9..ab4bf84af 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -998,7 +998,7 @@ server_request_tun(void)
998#if defined(SSH_TUN_FILTER) 998#if defined(SSH_TUN_FILTER)
999 if (mode == SSH_TUNMODE_POINTOPOINT) 999 if (mode == SSH_TUNMODE_POINTOPOINT)
1000 channel_register_filter(c->self, sys_tun_infilter, 1000 channel_register_filter(c->self, sys_tun_infilter,
1001 sys_tun_outfilter); 1001 sys_tun_outfilter, NULL, NULL);
1002#endif 1002#endif
1003 1003
1004 done: 1004 done: