diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 941556ace..7790564cc 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.99 2001/03/16 19:06:29 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.100 2001/04/04 20:25:35 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/rsa.h> | 45 | #include <openssl/rsa.h> |
46 | #include <openssl/dsa.h> | 46 | #include <openssl/dsa.h> |
@@ -1005,7 +1005,8 @@ channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset) | |||
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | void | 1007 | void |
1008 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp) | 1008 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, |
1009 | int rekeying) | ||
1009 | { | 1010 | { |
1010 | int n; | 1011 | int n; |
1011 | u_int sz; | 1012 | u_int sz; |
@@ -1025,7 +1026,8 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp) | |||
1025 | memset(*readsetp, 0, sz); | 1026 | memset(*readsetp, 0, sz); |
1026 | memset(*writesetp, 0, sz); | 1027 | memset(*writesetp, 0, sz); |
1027 | 1028 | ||
1028 | channel_handler(channel_pre, *readsetp, *writesetp); | 1029 | if (!rekeying) |
1030 | channel_handler(channel_pre, *readsetp, *writesetp); | ||
1029 | } | 1031 | } |
1030 | 1032 | ||
1031 | void | 1033 | void |