- (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]

   [auth-rsa.c auth-shadow.c auth-sia.c auth1.c auth2-chall.c]
   [auth2-gss.c auth2-kbdint.c auth2-none.c authfd.c authfile.c]
   [cipher-3des1.c cipher-aes.c cipher-bf1.c cipher-ctr.c clientloop.c]
   [dh.c dns.c entropy.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
   [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c loginrec.c mac.c]
   [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
   [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
   [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
   [sshconnect1.c sshconnect2.c sshd.c rc4.diff]
   [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
   [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
   [openbsd-compat/port-uw.c]
   Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
   compile problems reported by rac AT tenzing.org

59 files changed, 117 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index bef6b053..ebf30897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+20060901
+ - (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]
+   [auth-rsa.c auth-shadow.c auth-sia.c auth1.c auth2-chall.c]
+   [auth2-gss.c auth2-kbdint.c auth2-none.c authfd.c authfile.c]
+   [cipher-3des1.c cipher-aes.c cipher-bf1.c cipher-ctr.c clientloop.c]
+   [dh.c dns.c entropy.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
+   [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c loginrec.c mac.c]
+   [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
+   [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
+   [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
+   [sshconnect1.c sshconnect2.c sshd.c rc4.diff]
+   [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
+   [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
+   [openbsd-compat/port-uw.c]
+   Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
+   compile problems reported by rac AT tenzing.org
+
 20060831
  - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
    [platform.c platform.h sshd.c openbsd-compat/Makefile.in]
@@ -5348,4 +5365,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4520 2006/08/31 01:28:49 dtucker Exp $
+$Id: ChangeLog,v 1.4521 2006/09/01 05:38:36 djm Exp $
diff --git a/audit-bsm.c b/audit-bsm.c
index 50241b32..d5cf302c 100644
--- a/audit-bsm.c
+++ b/audit-bsm.c
@@ -1,4 +1,4 @@
-/* $Id: audit-bsm.c,v 1.3 2006/08/16 01:40:45 djm Exp $ */
+/* $Id: audit-bsm.c,v 1.4 2006/09/01 05:38:36 djm Exp $ */
 
 /*
  * TODO
@@ -39,6 +39,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <unistd.h>
 
 #include "ssh.h"
diff --git a/audit.c b/audit.c
index 8c3ec5a6..dbea34cb 100644
--- a/audit.c
+++ b/audit.c
@@ -1,4 +1,4 @@
-/* $Id: audit.c,v 1.4 2006/08/05 14:05:10 dtucker Exp $ */
+/* $Id: audit.c,v 1.5 2006/09/01 05:38:36 djm Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
@@ -26,6 +26,9 @@
 
 #include "includes.h"
 
+#include <stdarg.h>
+#include <string.h>
+
 #ifdef SSH_AUDIT_EVENTS
 
 #include "audit.h"
diff --git a/auth-bsdauth.c b/auth-bsdauth.c
index f718e5d3..37d527d1 100644
--- a/auth-bsdauth.c
+++ b/auth-bsdauth.c
@@ -27,6 +27,8 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
+
 #ifdef BSD_AUTH
 #include "xmalloc.h"
 #include "key.h"
diff --git a/auth-chall.c b/auth-chall.c
index 9c1079a1..919b1eaa 100644
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -27,6 +27,8 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
+
 #include "xmalloc.h"
 #include "key.h"
 #include "hostfile.h"
diff --git a/auth-pam.c b/auth-pam.c
index 8e9361ca..493993a1 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -54,6 +54,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/auth-rsa.c b/auth-rsa.c
index 1c66b86a..8c43458b 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -24,6 +24,7 @@
 
 #include <pwd.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
 
 #include "xmalloc.h"
diff --git a/auth-shadow.c b/auth-shadow.c
index 52447fe4..8b3160ae 100644
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -26,6 +26,7 @@
 
 #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
 #include <shadow.h>
+#include <stdarg.h>
 #include <string.h>
 
 #include "key.h"
diff --git a/auth-sia.c b/auth-sia.c
index af7182b4..63304d36 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -25,14 +25,6 @@
 #include "includes.h"
 
 #ifdef HAVE_OSF_SIA
-#include "ssh.h"
-#include "auth.h"
-#include "auth-sia.h"
-#include "log.h"
-#include "servconf.h"
-#include "canohost.h"
-#include "uidswap.h"
-
 #include <sia.h>
 #include <siad.h>
 #include <pwd.h>
@@ -40,8 +32,17 @@
 #include <setjmp.h>
 #include <sys/resource.h>
 #include <unistd.h>
+#include <stdarg.h>
 #include <string.h>
 
+#include "ssh.h"
+#include "auth.h"
+#include "auth-sia.h"
+#include "log.h"
+#include "servconf.h"
+#include "canohost.h"
+#include "uidswap.h"
+
 extern ServerOptions options;
 extern int saved_argc;
 extern char **saved_argv;
diff --git a/auth1.c b/auth1.c
index 34dcf626..b9d6b111 100644
--- a/auth1.c
+++ b/auth1.c
@@ -14,6 +14,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/auth2-chall.c b/auth2-chall.c
index b091957b..b78b739c 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/auth2-gss.c b/auth2-gss.c
index d88bc427..c77c841a 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -30,6 +30,8 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
+
 #include "xmalloc.h"
 #include "key.h"
 #include "hostfile.h"
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 90159648..a4fc9e6f 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -27,6 +27,8 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
+
 #include "xmalloc.h"
 #include "packet.h"
 #include "key.h"
diff --git a/auth2-none.c b/auth2-none.c
index f455bdde..952b4482 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -30,6 +30,7 @@
 #include <sys/uio.h>
 
 #include <fcntl.h>
+#include <stdarg.h>
 #include <unistd.h>
 
 #include "xmalloc.h"
diff --git a/authfd.c b/authfd.c
index 5c910df1..61faad12 100644
--- a/authfd.c
+++ b/authfd.c
@@ -47,6 +47,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/authfile.c b/authfile.c
index 67508564..735c6478 100644
--- a/authfile.c
+++ b/authfile.c
@@ -49,6 +49,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/cipher-3des1.c b/cipher-3des1.c
index 61798bfd..fc16e20d 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -29,6 +29,7 @@
 
 #include <openssl/evp.h>
 
+#include <stdarg.h>
 #include <string.h>
 
 #include "xmalloc.h"
diff --git a/cipher-aes.c b/cipher-aes.c
index 99e9eea9..14ef10f0 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -28,8 +28,12 @@
 #include "openbsd-compat/openssl-compat.h"
 
 #ifdef USE_BUILTIN_RIJNDAEL
+#include <sys/types.h>
 
 #include <openssl/evp.h>
+
+#include <stdarg.h>
+
 #include "rijndael.h"
 #include "xmalloc.h"
 #include "log.h"
diff --git a/cipher-bf1.c b/cipher-bf1.c
index eb4c0477..292488c5 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -29,6 +29,7 @@
 
 #include <openssl/evp.h>
 
+#include <stdarg.h>
 #include <string.h>
 
 #include "xmalloc.h"
diff --git a/cipher-ctr.c b/cipher-ctr.c
index 9733b7d5..b24f3a42 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <string.h>
 
 #include <openssl/evp.h>
diff --git a/clientloop.c b/clientloop.c
index 132d75a4..88dfb1f3 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -78,6 +78,7 @@
 #include <paths.h>
 #endif
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/dh.c b/dh.c
index 925eeddd..f6ef05cf 100644
--- a/dh.c
+++ b/dh.c
@@ -30,6 +30,7 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/dns.c b/dns.c
index 22921083..92623de7 100644
--- a/dns.c
+++ b/dns.c
@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 
 #include <netdb.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/entropy.c b/entropy.c
index c89e0b52..4f19c876 100644
--- a/entropy.c
+++ b/entropy.c
@@ -34,6 +34,7 @@
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
+#include <stdarg.h>
 #include <unistd.h>
 
 #include <openssl/rand.h>
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 006bedad..5a625acb 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -31,6 +31,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <string.h>
 
 #include "xmalloc.h"
diff --git a/gss-serv.c b/gss-serv.c
index 296f63a8..e8191a85 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -30,6 +30,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/hostfile.c b/hostfile.c
index 08ba4426..2cceb352 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -46,6 +46,7 @@
 #include <openssl/sha.h>
 
 #include <resolv.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kex.c b/kex.c
index 0c36519a..bfc1c11f 100644
--- a/kex.c
+++ b/kex.c
@@ -28,6 +28,7 @@
 #include <sys/param.h>
 
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kexdhc.c b/kexdhc.c
index bf875ae0..64de7af3 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
diff --git a/kexdhs.c b/kexdhs.c
index 7d2c21ee..93ec97f9 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -26,6 +26,8 @@
 #include "includes.h"
 
 #include <sys/types.h>
+
+#include <stdarg.h>
 #include <string.h>
 #include <signal.h>
 
diff --git a/kexgexc.c b/kexgexc.c
index fc48880d..2c19713e 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
diff --git a/kexgexs.c b/kexgexs.c
index 7599f2af..5373a633 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -28,6 +28,7 @@
 
 #include <sys/param.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
diff --git a/key.c b/key.c
index 40aab20e..f3b3d6b9 100644
--- a/key.c
+++ b/key.c
@@ -39,6 +39,7 @@
 
 #include <openssl/evp.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/loginrec.c b/loginrec.c
index 7850312b..67447edc 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -156,6 +156,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/mac.c b/mac.c
index edf9b69b..e5d5bfa8 100644
--- a/mac.c
+++ b/mac.c
@@ -29,6 +29,7 @@
 
 #include <openssl/hmac.h>
 
+#include <stdarg.h>
 #include <string.h>
 #include <signal.h>
 
diff --git a/md5crypt.c b/md5crypt.c
index 253fdfdf..22ef9893 100644
--- a/md5crypt.c
+++ b/md5crypt.c
@@ -11,6 +11,10 @@
 #include "includes.h"
 
 #if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
+#include <sys/types.h>
+
+#include <string.h>
+
 #include <openssl/md5.h>
 
 /* 0 ... 63 => ascii - 64 */
diff --git a/monitor.c b/monitor.c
index 83b3765a..b3ccde01 100644
--- a/monitor.c
+++ b/monitor.c
@@ -40,6 +40,7 @@
 #endif
 #include <pwd.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 431b3e49..3865539d 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <pwd.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index 8093f6d5..1532c991 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.c,v 1.15 2006/07/24 05:08:36 djm Exp $
+ * $Id: bsd-cray.c,v 1.16 2006/09/01 05:38:41 djm Exp $
  *
  * bsd-cray.c
  *
@@ -52,6 +52,7 @@
 #include <sys/secstat.h>
 #include <sys/stat.h>
 #include <sys/session.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 13a73e87..d0a42300 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -41,6 +41,7 @@
 # include <netdb.h>
 #endif
 #include <uinfo.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 5e2e878d..77f3a1c1 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.2 2006/07/24 04:51:01 djm Exp $ */
+/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -24,6 +24,7 @@
 #include "includes.h"
 
 #include <errno.h>
+#include <stdarg.h>
 #include <string.h>
 
 #ifdef WITH_SELINUX
diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c
index f31f0c6e..f57433e7 100644
--- a/openbsd-compat/port-solaris.c
+++ b/openbsd-compat/port-solaris.c
@@ -1,4 +1,4 @@
-/* $Id: port-solaris.c,v 1.1 2006/08/30 17:24:42 djm Exp $ */
+/* $Id: port-solaris.c,v 1.2 2006/09/01 05:38:41 djm Exp $ */
 
 /*
  * Copyright (c) 2006 Chad Mynhier.
@@ -29,6 +29,7 @@
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c
index c6442712..6f352390 100644
--- a/openbsd-compat/port-uw.c
+++ b/