summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth.c4
-rw-r--r--fatal.c4
-rw-r--r--includes.h4
-rw-r--r--log.c3
-rw-r--r--log.h4
-rw-r--r--misc.c4
-rw-r--r--packet.c4
-rw-r--r--readpass.c3
-rw-r--r--scp.c3
-rw-r--r--ssh-keyscan.c3
-rw-r--r--xmalloc.c4
12 files changed, 31 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index ba787e050..f152f91ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
14 - jmc@cvs.openbsd.org 2006/07/10 16:04:21 14 - jmc@cvs.openbsd.org 2006/07/10 16:04:21
15 [sshd.8] 15 [sshd.8]
16 s/and and/and/ 16 s/and and/and/
17 - stevesk@cvs.openbsd.org 2006/07/10 16:37:36
18 [readpass.c log.h scp.c fatal.c xmalloc.c includes.h ssh-keyscan.c misc.c
19 auth.c packet.c log.c]
20 move #include <stdarg.h> out of includes.h; ok markus@
17 21
1820060711 2220060711
19 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c 23 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4863,4 +4867,4 @@
4863 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4867 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4864 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4868 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4865 4869
4866$Id: ChangeLog,v 1.4393 2006/07/12 12:07:59 dtucker Exp $ 4870$Id: ChangeLog,v 1.4394 2006/07/12 12:15:16 dtucker Exp $
diff --git a/auth.c b/auth.c
index 0c8894c99..6901c936a 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth.c,v 1.69 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -38,10 +38,10 @@
38#ifdef USE_SHADOW 38#ifdef USE_SHADOW
39#include <shadow.h> 39#include <shadow.h>
40#endif 40#endif
41
42#ifdef HAVE_LIBGEN_H 41#ifdef HAVE_LIBGEN_H
43#include <libgen.h> 42#include <libgen.h>
44#endif 43#endif
44#include <stdarg.h>
45 45
46#include "xmalloc.h" 46#include "xmalloc.h"
47#include "match.h" 47#include "match.h"
diff --git a/fatal.c b/fatal.c
index 7f58970fb..1f2cd0bc8 100644
--- a/fatal.c
+++ b/fatal.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: fatal.c,v 1.5 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: fatal.c,v 1.6 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,8 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <stdarg.h>
29
28#include "log.h" 30#include "log.h"
29 31
30/* Fatal messages. This function never returns. */ 32/* Fatal messages. This function never returns. */
diff --git a/includes.h b/includes.h
index 6e8f5416f..22a2c5944 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.47 2006/07/09 15:15:10 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.48 2006/07/10 16:37:36 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,12 +20,10 @@
20 20
21#define _GNU_SOURCE /* activate extra prototypes for glibc */ 21#define _GNU_SOURCE /* activate extra prototypes for glibc */
22 22
23#include <stdarg.h>
24#include <stdio.h> 23#include <stdio.h>
25#include <errno.h> 24#include <errno.h>
26#include <stdlib.h> 25#include <stdlib.h>
27#include <string.h> 26#include <string.h>
28#include <stdarg.h>
29#include <time.h> 27#include <time.h>
30#include <stddef.h> 28#include <stddef.h>
31 29
diff --git a/log.c b/log.c
index f7f92bcac..8702c3e52 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.c,v 1.32 2006/07/08 23:30:06 stevesk Exp $ */ 1/* $OpenBSD: log.c,v 1.33 2006/07/10 16:37:36 stevesk 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
@@ -36,6 +36,7 @@
36 36
37#include "includes.h" 37#include "includes.h"
38 38
39#include <stdarg.h>
39#include <syslog.h> 40#include <syslog.h>
40#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 41#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
41# include <vis.h> 42# include <vis.h>
diff --git a/log.h b/log.h
index 21437cff6..9e1a2fcdb 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.h,v 1.12 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: log.h,v 1.13 2006/07/10 16:37:36 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,8 @@
15#ifndef SSH_LOG_H 15#ifndef SSH_LOG_H
16#define SSH_LOG_H 16#define SSH_LOG_H
17 17
18#include <stdarg.h>
19
18#include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */ 20#include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */
19 21
20/* Supported syslog facilities and levels. */ 22/* Supported syslog facilities and levels. */
diff --git a/misc.c b/misc.c
index a65b1fded..4d6576ad6 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.56 2006/07/10 12:46:51 dtucker Exp $ */ 1/* $OpenBSD: misc.c,v 1.57 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -30,6 +30,8 @@
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/socket.h> 31#include <sys/socket.h>
32 32
33#include <stdarg.h>
34
33#include <netinet/in.h> 35#include <netinet/in.h>
34#include <netinet/tcp.h> 36#include <netinet/tcp.h>
35 37
diff --git a/packet.c b/packet.c
index f04d6fac9..b4f3aea14 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.133 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: packet.c,v 1.134 2006/07/10 16:37:36 stevesk 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
@@ -47,6 +47,8 @@
47#include <netinet/in.h> 47#include <netinet/in.h>
48#include <netinet/ip.h> 48#include <netinet/ip.h>
49 49
50#include <stdarg.h>
51
50#include "xmalloc.h" 52#include "xmalloc.h"
51#include "buffer.h" 53#include "buffer.h"
52#include "packet.h" 54#include "packet.h"
diff --git a/readpass.c b/readpass.c
index b83b6f5ee..0da75ac11 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.c,v 1.40 2006/07/09 15:15:10 stevesk Exp $ */ 1/* $OpenBSD: readpass.c,v 1.41 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -32,6 +32,7 @@
32#ifdef HAVE_PATHS_H 32#ifdef HAVE_PATHS_H
33# include <paths.h> 33# include <paths.h>
34#endif 34#endif
35#include <stdarg.h>
35 36
36#include "xmalloc.h" 37#include "xmalloc.h"
37#include "misc.h" 38#include "misc.h"
diff --git a/scp.c b/scp.c
index 6fe246d8c..c15fbbc2a 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.145 2006/07/10 12:03:20 djm Exp $ */ 1/* $OpenBSD: scp.c,v 1.146 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * scp - secure remote copy. This is basically patched BSD rcp which 3 * scp - secure remote copy. This is basically patched BSD rcp which
4 * uses ssh to do the data transfer (instead of using rcmd). 4 * uses ssh to do the data transfer (instead of using rcmd).
@@ -84,6 +84,7 @@
84#include <fcntl.h> 84#include <fcntl.h>
85#include <pwd.h> 85#include <pwd.h>
86#include <signal.h> 86#include <signal.h>
87#include <stdarg.h>
87 88
88#include "xmalloc.h" 89#include "xmalloc.h"
89#include "atomicio.h" 90#include "atomicio.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 85ee168e7..76c2ed13c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.65 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.66 2006/07/10 16:37:36 stevesk Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -11,6 +11,7 @@
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13#include <sys/resource.h> 13#include <sys/resource.h>
14#include <stdarg.h>
14 15
15#include <openssl/bn.h> 16#include <openssl/bn.h>
16 17
diff --git a/xmalloc.c b/xmalloc.c
index 110d8cb7f..8f9c3e12e 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: xmalloc.c,v 1.21 2006/03/27 01:21:18 deraadt Exp $ */ 1/* $OpenBSD: xmalloc.c,v 1.22 2006/07/10 16:37:36 stevesk 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
@@ -15,6 +15,8 @@
15 15
16#include "includes.h" 16#include "includes.h"
17 17
18#include <stdarg.h>
19
18#include "xmalloc.h" 20#include "xmalloc.h"
19#include "log.h" 21#include "log.h"
20 22