From 4c72fcfd7bd7c9962f577386faf095ced8e0f24c Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Wed, 12 Jul 2006 12:15:16 +0000
Subject: [PATCH]    - stevesk@cvs.openbsd.org 2006/07/10 16:37:36     
 [readpass.c log.h scp.c fatal.c xmalloc.c includes.h ssh-keyscan.c misc.c    
  auth.c packet.c log.c]      move #include <stdarg.h> out of includes.h; ok
 markus@

---
 ChangeLog     | 4 ++++
 auth.c        | 4 ++--
 fatal.c       | 4 +++-
 includes.h    | 4 +---
 log.c         | 3 ++-
 log.h         | 4 +++-
 misc.c        | 4 +++-
 packet.c      | 4 +++-
 readpass.c    | 3 ++-
 scp.c         | 3 ++-
 ssh-keyscan.c | 3 ++-
 xmalloc.c     | 4 +++-
 12 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d528802..8b195d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
    - jmc@cvs.openbsd.org 2006/07/10 16:04:21
      [sshd.8]
      s/and and/and/
+   - stevesk@cvs.openbsd.org 2006/07/10 16:37:36
+     [readpass.c log.h scp.c fatal.c xmalloc.c includes.h ssh-keyscan.c misc.c
+     auth.c packet.c log.c]
+     move #include <stdarg.h> out of includes.h; ok markus@
 
 20060711
  - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
diff --git a/auth.c b/auth.c
index 0c8894c9..6901c936 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: auth.c,v 1.69 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -38,10 +38,10 @@
 #ifdef USE_SHADOW
 #include <shadow.h>
 #endif
-
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
 #endif
+#include <stdarg.h>
 
 #include "xmalloc.h"
 #include "match.h"
diff --git a/fatal.c b/fatal.c
index 7f58970f..1f2cd0bc 100644
--- a/fatal.c
+++ b/fatal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fatal.c,v 1.5 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: fatal.c,v 1.6 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -25,6 +25,8 @@
 
 #include "includes.h"
 
+#include <stdarg.h>
+
 #include "log.h"
 
 /* Fatal messages.  This function never returns. */
diff --git a/includes.h b/includes.h
index 6e8f5416..22a2c594 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.47 2006/07/09 15:15:10 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.48 2006/07/10 16:37:36 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,12 +20,10 @@
 
 #define _GNU_SOURCE /* activate extra prototypes for glibc */
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
 #include <stddef.h>
 
diff --git a/log.c b/log.c
index f7f92bca..8702c3e5 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.32 2006/07/08 23:30:06 stevesk Exp $ */
+/* $OpenBSD: log.c,v 1.33 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,6 +36,7 @@
 
 #include "includes.h"
 
+#include <stdarg.h>
 #include <syslog.h>
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
 # include <vis.h>
diff --git a/log.h b/log.h
index 21437cff..9e1a2fcd 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.12 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: log.h,v 1.13 2006/07/10 16:37:36 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,8 @@
 #ifndef SSH_LOG_H
 #define SSH_LOG_H
 
+#include <stdarg.h>
+
 #include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */
 
 /* Supported syslog facilities and levels. */
diff --git a/misc.c b/misc.c
index a65b1fde..4d6576ad 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.56 2006/07/10 12:46:51 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.57 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -30,6 +30,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <stdarg.h>
+
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
diff --git a/packet.c b/packet.c
index f04d6fac..b4f3aea1 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.133 2006/07/08 21:47:12 stevesk Exp $ */
+/* $OpenBSD: packet.c,v 1.134 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -47,6 +47,8 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
+#include <stdarg.h>
+
 #include "xmalloc.h"
 #include "buffer.h"
 #include "packet.h"
diff --git a/readpass.c b/readpass.c
index b83b6f5e..0da75ac1 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.40 2006/07/09 15:15:10 stevesk Exp $ */
+/* $OpenBSD: readpass.c,v 1.41 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -32,6 +32,7 @@
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
+#include <stdarg.h>
 
 #include "xmalloc.h"
 #include "misc.h"
diff --git a/scp.c b/scp.c
index 6fe246d8..c15fbbc2 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.145 2006/07/10 12:03:20 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.146 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -84,6 +84,7 @@
 #include <fcntl.h>
 #include <pwd.h>
 #include <signal.h>
+#include <stdarg.h>
 
 #include "xmalloc.h"
 #include "atomicio.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 85ee168e..76c2ed13 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.65 2006/07/08 21:47:12 stevesk Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.66 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -11,6 +11,7 @@
  
 #include "openbsd-compat/sys-queue.h"
 #include <sys/resource.h>
+#include <stdarg.h>
 
 #include <openssl/bn.h>
 
diff --git a/xmalloc.c b/xmalloc.c
index 110d8cb7..8f9c3e12 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.21 2006/03/27 01:21:18 deraadt Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.22 2006/07/10 16:37:36 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -15,6 +15,8 @@
 
 #include "includes.h"
 
+#include <stdarg.h>
+
 #include "xmalloc.h"
 #include "log.h"
 
-- 
2.45.2