diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:36:13 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:39:41 +0000 |
| commit | 2028ecabc263b3e43903b8d170f4bbd07fe408e9 (patch) | |
| tree | 565242aad1c1d73b6d99f9bf2c62278fca5bdd8c /sshconnect.c | |
| parent | 18a9bd1867ee6fb9d913515773b322a279759b5d (diff) | |
| parent | 733c4de05612fe398ac3dc7d31d318d7012fda05 (diff) | |
New upstream release (7.1p1).
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 2999061b3..0ec1e54e9 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); |