summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 09e3f192b..a033e905f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,9 @@
108 - stevesk@cvs.openbsd.org 2001/06/29 18:38:44 108 - stevesk@cvs.openbsd.org 2001/06/29 18:38:44
109 [clientloop.c] 109 [clientloop.c]
110 sync function definition with declaration; ok markus@ 110 sync function definition with declaration; ok markus@
111 - stevesk@cvs.openbsd.org 2001/06/29 18:40:28
112 [channels.c]
113 use socklen_t for getsockopt arg #5; ok markus@
111 114
11220010629 11520010629
113 - (bal) Removed net_aton() since we don't use it any more 116 - (bal) Removed net_aton() since we don't use it any more
@@ -5935,4 +5938,4 @@
5935 - Wrote replacements for strlcpy and mkdtemp 5938 - Wrote replacements for strlcpy and mkdtemp
5936 - Released 1.0pre1 5939 - Released 1.0pre1
5937 5940
5938$Id: ChangeLog,v 1.1370 2001/07/04 05:10:27 mouring Exp $ 5941$Id: ChangeLog,v 1.1371 2001/07/04 05:13:35 mouring Exp $
diff --git a/channels.c b/channels.c
index 2721ec6bc..937e059cc 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.128 2001/06/25 08:25:35 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.129 2001/06/29 18:40:28 stevesk Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -1142,7 +1142,7 @@ static void
1142channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset) 1142channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset)
1143{ 1143{
1144 int err = 0; 1144 int err = 0;
1145 int sz = sizeof(err); 1145 socklen_t sz = sizeof(err);
1146 1146
1147 if (FD_ISSET(c->sock, writeset)) { 1147 if (FD_ISSET(c->sock, writeset)) {
1148 if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err, 1148 if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err,