[channels.c]
     use socklen_t for getsockopt arg #5; ok markus@
This commit is contained in:
Ben Lindstrom 2001-07-04 05:13:35 +00:00
parent db47f383e6
commit 1118095d33
2 changed files with 6 additions and 3 deletions

View File

@ -108,6 +108,9 @@
- stevesk@cvs.openbsd.org 2001/06/29 18:38:44 - stevesk@cvs.openbsd.org 2001/06/29 18:38:44
[clientloop.c] [clientloop.c]
sync function definition with declaration; ok markus@ sync function definition with declaration; ok markus@
- stevesk@cvs.openbsd.org 2001/06/29 18:40:28
[channels.c]
use socklen_t for getsockopt arg #5; ok markus@
20010629 20010629
- (bal) Removed net_aton() since we don't use it any more - (bal) Removed net_aton() since we don't use it any more
@ -5935,4 +5938,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1370 2001/07/04 05:10:27 mouring Exp $ $Id: ChangeLog,v 1.1371 2001/07/04 05:13:35 mouring Exp $

View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.128 2001/06/25 08:25:35 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.129 2001/06/29 18:40:28 stevesk Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1142,7 +1142,7 @@ static void
channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset) channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset)
{ {
int err = 0; int err = 0;
int sz = sizeof(err); socklen_t sz = sizeof(err);
if (FD_ISSET(c->sock, writeset)) { if (FD_ISSET(c->sock, writeset)) {
if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err, if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err,