diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:59:58 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:59:58 +0100 |
| commit | 651211fd4a199b299540c00c54a46e27fadb04be (patch) | |
| tree | 26dbf99c8861a7f94d0c00be71b38869728ebd81 /sshconnect.c | |
| parent | 58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (diff) | |
| parent | e91346dc2bbf460246df2ab591b7613908c1b0ad (diff) | |
Import openssh_7.1p1.orig.tar.gz
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index f41960c5d..17fbe39b0 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sshconnect.c,v 1.262 2015/05/28 05:41:29 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.263 2015/08/20 22:32:42 deraadt Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| @@ -356,7 +356,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, | |||
| 356 | goto done; | 356 | goto done; |
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | fdset = (fd_set *)xcalloc(howmany(sockfd + 1, NFDBITS), | 359 | fdset = xcalloc(howmany(sockfd + 1, NFDBITS), |
| 360 | sizeof(fd_mask)); | 360 | sizeof(fd_mask)); |
| 361 | FD_SET(sockfd, fdset); | 361 | FD_SET(sockfd, fdset); |
| 362 | ms_to_timeval(&tv, *timeoutp); | 362 | ms_to_timeval(&tv, *timeoutp); |