diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ssh-keyscan.c | 9 |
2 files changed, 16 insertions, 5 deletions
@@ -63,6 +63,16 @@ | |||
63 | - more strict prototypes, include necessary headers | 63 | - more strict prototypes, include necessary headers |
64 | - use paths.h/pathnames.h decls | 64 | - use paths.h/pathnames.h decls |
65 | - size_t typecase to int -> u_long | 65 | - size_t typecase to int -> u_long |
66 | - itojun@cvs.openbsd.org 2001/02/07 18:04:50 | ||
67 | [ssh-keyscan.c] | ||
68 | fix size_t -> int cast (use u_long). markus ok | ||
69 | - markus@cvs.openbsd.org 2001/02/07 22:43:16 | ||
70 | [ssh-keyscan.c] | ||
71 | s/getline/Linebuf_getline/; from roumen.petrov@skalasoft.com | ||
72 | - itojun@cvs.openbsd.org 2001/02/09 9:04:59 | ||
73 | [ssh-keyscan.c] | ||
74 | do not assume malloc() returns zero-filled region. found by | ||
75 | malloc.conf=AJ. | ||
66 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' | 76 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' |
67 | (from the OpenBSD tree) | 77 | (from the OpenBSD tree) |
68 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD | 78 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD |
@@ -3850,4 +3860,4 @@ | |||
3850 | - Wrote replacements for strlcpy and mkdtemp | 3860 | - Wrote replacements for strlcpy and mkdtemp |
3851 | - Released 1.0pre1 | 3861 | - Released 1.0pre1 |
3852 | 3862 | ||
3853 | $Id: ChangeLog,v 1.731 2001/02/10 23:13:41 mouring Exp $ | 3863 | $Id: ChangeLog,v 1.732 2001/02/10 23:18:11 mouring Exp $ |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index e48c0865e..834649fef 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.12 2001/02/04 15:32:26 stevesk Exp $"); | 11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.15 2001/02/09 09:04:59 itojun Exp $"); |
12 | 12 | ||
13 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | 13 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) |
14 | #include <sys/queue.h> | 14 | #include <sys/queue.h> |
@@ -146,7 +146,7 @@ Linebuf_lineno(Linebuf * lb) | |||
146 | } | 146 | } |
147 | 147 | ||
148 | static inline char * | 148 | static inline char * |
149 | getline(Linebuf * lb) | 149 | Linebuf_getline(Linebuf * lb) |
150 | { | 150 | { |
151 | int n = 0; | 151 | int n = 0; |
152 | 152 | ||
@@ -490,7 +490,7 @@ conloop(void) | |||
490 | seltime = c->c_tv; | 490 | seltime = c->c_tv; |
491 | seltime.tv_sec -= now.tv_sec; | 491 | seltime.tv_sec -= now.tv_sec; |
492 | seltime.tv_usec -= now.tv_usec; | 492 | seltime.tv_usec -= now.tv_usec; |
493 | if ((int) seltime.tv_usec < 0) { | 493 | if (seltime.tv_usec < 0) { |
494 | seltime.tv_usec += 1000000; | 494 | seltime.tv_usec += 1000000; |
495 | seltime.tv_sec--; | 495 | seltime.tv_sec--; |
496 | } | 496 | } |
@@ -547,7 +547,7 @@ nexthost(int argc, char **argv) | |||
547 | error("ignoring invalid/misplaced option `%s'", argv[argno++]); | 547 | error("ignoring invalid/misplaced option `%s'", argv[argno++]); |
548 | } else { | 548 | } else { |
549 | char *line; | 549 | char *line; |
550 | line = getline(lb); | 550 | line = Linebuf_getline(lb); |
551 | if (line) | 551 | if (line) |
552 | return (line); | 552 | return (line); |
553 | Linebuf_free(lb); | 553 | Linebuf_free(lb); |
@@ -599,6 +599,7 @@ main(int argc, char **argv) | |||
599 | if (maxfd > fdlim_get(0)) | 599 | if (maxfd > fdlim_get(0)) |
600 | fdlim_set(maxfd); | 600 | fdlim_set(maxfd); |
601 | fdcon = xmalloc(maxfd * sizeof(con)); | 601 | fdcon = xmalloc(maxfd * sizeof(con)); |
602 | memset(fdcon, 0, maxfd * sizeof(con)); | ||
602 | 603 | ||
603 | do { | 604 | do { |
604 | while (ncon < maxcon) { | 605 | while (ncon < maxcon) { |