summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keyscan.c20
2 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c20486d1..cb3b2e45c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -171,6 +171,10 @@
171 - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy() 171 - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy()
172 - (bal) Fix up logging since it changed. removed log-*.c 172 - (bal) Fix up logging since it changed. removed log-*.c
173 - (djm) Fix up LOG_AUTHPRIV for systems that have it 173 - (djm) Fix up LOG_AUTHPRIV for systems that have it
174 - (stevesk) OpenBSD sync:
175 - deraadt@cvs.openbsd.org 2001/03/05 08:37:27
176 [ssh-keyscan.c]
177 skip inlining, why bother
174 178
17520010304 17920010304
176 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 180 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4363,4 +4367,4 @@
4363 - Wrote replacements for strlcpy and mkdtemp 4367 - Wrote replacements for strlcpy and mkdtemp
4364 - Released 1.0pre1 4368 - Released 1.0pre1
4365 4369
4366$Id: ChangeLog,v 1.906 2001/03/05 10:23:31 djm Exp $ 4370$Id: ChangeLog,v 1.907 2001/03/05 19:46:37 stevesk Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index ab46e9edb..ab7f33d04 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"
11RCSID("$OpenBSD: ssh-keyscan.c,v 1.19 2001/03/03 21:19:41 millert Exp $"); 11RCSID("$OpenBSD: ssh-keyscan.c,v 1.20 2001/03/05 15:37:27 deraadt 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>
@@ -91,7 +91,7 @@ typedef struct {
91 void (*errfun) (const char *,...); 91 void (*errfun) (const char *,...);
92} Linebuf; 92} Linebuf;
93 93
94static __inline__ Linebuf * 94Linebuf *
95Linebuf_alloc(const char *filename, void (*errfun) (const char *,...)) 95Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
96{ 96{
97 Linebuf *lb; 97 Linebuf *lb;
@@ -125,7 +125,7 @@ Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
125 return (lb); 125 return (lb);
126} 126}
127 127
128static __inline__ void 128void
129Linebuf_free(Linebuf * lb) 129Linebuf_free(Linebuf * lb)
130{ 130{
131 fclose(lb->stream); 131 fclose(lb->stream);
@@ -133,7 +133,7 @@ Linebuf_free(Linebuf * lb)
133 xfree(lb); 133 xfree(lb);
134} 134}
135 135
136static __inline__ void 136void
137Linebuf_restart(Linebuf * lb) 137Linebuf_restart(Linebuf * lb)
138{ 138{
139 clearerr(lb->stream); 139 clearerr(lb->stream);
@@ -141,13 +141,13 @@ Linebuf_restart(Linebuf * lb)
141 lb->lineno = 0; 141 lb->lineno = 0;
142} 142}
143 143
144static __inline__ int 144int
145Linebuf_lineno(Linebuf * lb) 145Linebuf_lineno(Linebuf * lb)
146{ 146{
147 return (lb->lineno); 147 return (lb->lineno);
148} 148}
149 149
150static __inline__ char * 150char *
151Linebuf_getline(Linebuf * lb) 151Linebuf_getline(Linebuf * lb)
152{ 152{
153 int n = 0; 153 int n = 0;
@@ -184,7 +184,7 @@ Linebuf_getline(Linebuf * lb)
184 } 184 }
185} 185}
186 186
187static int 187int
188fdlim_get(int hard) 188fdlim_get(int hard)
189{ 189{
190#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) 190#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
@@ -203,7 +203,7 @@ fdlim_get(int hard)
203#endif 203#endif
204} 204}
205 205
206static int 206int
207fdlim_set(int lim) 207fdlim_set(int lim)
208{ 208{
209#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) 209#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)
@@ -228,7 +228,7 @@ fdlim_set(int lim)
228 * separators. This is the same as the 4.4BSD strsep, but different from the 228 * separators. This is the same as the 4.4BSD strsep, but different from the
229 * one in the GNU libc. 229 * one in the GNU libc.
230 */ 230 */
231static __inline__ char * 231char *
232xstrsep(char **str, const char *delim) 232xstrsep(char **str, const char *delim)
233{ 233{
234 char *s, *e; 234 char *s, *e;
@@ -574,7 +574,7 @@ nexthost(int argc, char **argv)
574 } 574 }
575} 575}
576 576
577static void 577void
578usage(void) 578usage(void)
579{ 579{
580 fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname); 580 fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname);