summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-09-01 15:38:36 +1000
committerDamien Miller <djm@mindrot.org>2006-09-01 15:38:36 +1000
commitded319cca23923651ddc5e6a4bd4bda66d0737f4 (patch)
tree481c5b651ae31a109124e6b60f5ce713c4a46b67
parent288cbbd59ed70dc137f83588a9ded946069776cc (diff)
- (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
-rw-r--r--ChangeLog19
-rw-r--r--audit-bsm.c3
-rw-r--r--audit.c5
-rw-r--r--auth-bsdauth.c2
-rw-r--r--auth-chall.c2
-rw-r--r--auth-pam.c1
-rw-r--r--auth-rsa.c1
-rw-r--r--auth-shadow.c1
-rw-r--r--auth-sia.c17
-rw-r--r--auth1.c1
-rw-r--r--auth2-chall.c1
-rw-r--r--auth2-gss.c2
-rw-r--r--auth2-kbdint.c2
-rw-r--r--auth2-none.c1
-rw-r--r--authfd.c1
-rw-r--r--authfile.c1
-rw-r--r--cipher-3des1.c1
-rw-r--r--cipher-aes.c4
-rw-r--r--cipher-bf1.c1
-rw-r--r--cipher-ctr.c1
-rw-r--r--clientloop.c1
-rw-r--r--dh.c1
-rw-r--r--dns.c1
-rw-r--r--entropy.c1
-rw-r--r--gss-serv-krb5.c1
-rw-r--r--gss-serv.c1
-rw-r--r--hostfile.c1
-rw-r--r--kex.c1
-rw-r--r--kexdhc.c1
-rw-r--r--kexdhs.c2
-rw-r--r--kexgexc.c1
-rw-r--r--kexgexs.c1
-rw-r--r--key.c1
-rw-r--r--loginrec.c1
-rw-r--r--mac.c1
-rw-r--r--md5crypt.c4
-rw-r--r--monitor.c1
-rw-r--r--monitor_wrap.c1
-rw-r--r--openbsd-compat/bsd-cray.c3
-rw-r--r--openbsd-compat/port-aix.c1
-rw-r--r--openbsd-compat/port-linux.c3
-rw-r--r--openbsd-compat/port-solaris.c3
-rw-r--r--openbsd-compat/port-uw.c15
-rw-r--r--readconf.c1
-rw-r--r--rsa.c1
-rw-r--r--scard-opensc.c4
-rw-r--r--scard.c1
-rw-r--r--session.c1
-rw-r--r--ssh-add.c1
-rw-r--r--ssh-agent.c1
-rw-r--r--ssh-dss.c1
-rw-r--r--ssh-keygen.c1
-rw-r--r--ssh-keysign.c1
-rw-r--r--ssh-rsa.c1
-rw-r--r--ssh.c1
-rw-r--r--sshconnect.c1
-rw-r--r--sshconnect1.c1
-rw-r--r--sshconnect2.c1
-rw-r--r--sshd.c1
59 files changed, 117 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index bef6b0538..ebf308975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
120060901
2 - (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]
3 [auth-rsa.c auth-shadow.c auth-sia.c auth1.c auth2-chall.c]
4 [auth2-gss.c auth2-kbdint.c auth2-none.c authfd.c authfile.c]
5 [cipher-3des1.c cipher-aes.c cipher-bf1.c cipher-ctr.c clientloop.c]
6 [dh.c dns.c entropy.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
7 [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c loginrec.c mac.c]
8 [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
9 [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
10 [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
11 [sshconnect1.c sshconnect2.c sshd.c rc4.diff]
12 [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
13 [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
14 [openbsd-compat/port-uw.c]
15 Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
16 compile problems reported by rac AT tenzing.org
17
120060831 1820060831
2 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ] 19 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
3 [platform.c platform.h sshd.c openbsd-compat/Makefile.in] 20 [platform.c platform.h sshd.c openbsd-compat/Makefile.in]
@@ -5348,4 +5365,4 @@
5348 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5365 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5349 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5366 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5350 5367
5351$Id: ChangeLog,v 1.4520 2006/08/31 01:28:49 dtucker Exp $ 5368$Id: ChangeLog,v 1.4521 2006/09/01 05:38:36 djm Exp $
diff --git a/audit-bsm.c b/audit-bsm.c
index 50241b32f..d5cf302ce 100644
--- a/audit-bsm.c
+++ b/audit-bsm.c
@@ -1,4 +1,4 @@
1/* $Id: audit-bsm.c,v 1.3 2006/08/16 01:40:45 djm Exp $ */ 1/* $Id: audit-bsm.c,v 1.4 2006/09/01 05:38:36 djm Exp $ */
2 2
3/* 3/*
4 * TODO 4 * TODO
@@ -39,6 +39,7 @@
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41 41
42#include <stdarg.h>
42#include <unistd.h> 43#include <unistd.h>
43 44
44#include "ssh.h" 45#include "ssh.h"
diff --git a/audit.c b/audit.c
index 8c3ec5a6a..dbea34cb2 100644
--- a/audit.c
+++ b/audit.c
@@ -1,4 +1,4 @@
1/* $Id: audit.c,v 1.4 2006/08/05 14:05:10 dtucker Exp $ */ 1/* $Id: audit.c,v 1.5 2006/09/01 05:38:36 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. 4 * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved.
@@ -26,6 +26,9 @@
26 26
27#include "includes.h" 27#include "includes.h"
28 28
29#include <stdarg.h>
30#include <string.h>
31
29#ifdef SSH_AUDIT_EVENTS 32#ifdef SSH_AUDIT_EVENTS
30 33
31#include "audit.h" 34#include "audit.h"
diff --git a/auth-bsdauth.c b/auth-bsdauth.c
index f718e5d38..37d527d11 100644
--- a/auth-bsdauth.c
+++ b/auth-bsdauth.c
@@ -27,6 +27,8 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdarg.h>
31
30#ifdef BSD_AUTH 32#ifdef BSD_AUTH
31#include "xmalloc.h" 33#include "xmalloc.h"
32#include "key.h" 34#include "key.h"
diff --git a/auth-chall.c b/auth-chall.c
index 9c1079a17..919b1eaa4 100644
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -27,6 +27,8 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdarg.h>
31
30#include "xmalloc.h" 32#include "xmalloc.h"
31#include "key.h" 33#include "key.h"
32#include "hostfile.h" 34#include "hostfile.h"
diff --git a/auth-pam.c b/auth-pam.c
index 8e9361caa..493993a10 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -54,6 +54,7 @@
54 54
55#include <errno.h> 55#include <errno.h>
56#include <signal.h> 56#include <signal.h>
57#include <stdarg.h>
57#include <string.h> 58#include <string.h>
58#include <unistd.h> 59#include <unistd.h>
59 60
diff --git a/auth-rsa.c b/auth-rsa.c
index 1c66b86a4..8c43458b0 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -24,6 +24,7 @@
24 24
25#include <pwd.h> 25#include <pwd.h>
26#include <stdio.h> 26#include <stdio.h>
27#include <stdarg.h>
27#include <string.h> 28#include <string.h>
28 29
29#include "xmalloc.h" 30#include "xmalloc.h"
diff --git a/auth-shadow.c b/auth-shadow.c
index 52447fe4a..8b3160aee 100644
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -26,6 +26,7 @@
26 26
27#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) 27#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
28#include <shadow.h> 28#include <shadow.h>
29#include <stdarg.h>
29#include <string.h> 30#include <string.h>
30 31
31#include "key.h" 32#include "key.h"
diff --git a/auth-sia.c b/auth-sia.c
index af7182b48..63304d36e 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -25,14 +25,6 @@
25#include "includes.h" 25#include "includes.h"
26 26
27#ifdef HAVE_OSF_SIA 27#ifdef HAVE_OSF_SIA
28#include "ssh.h"
29#include "auth.h"
30#include "auth-sia.h"
31#include "log.h"
32#include "servconf.h"
33#include "canohost.h"
34#include "uidswap.h"
35
36#include <sia.h> 28#include <sia.h>
37#include <siad.h> 29#include <siad.h>
38#include <pwd.h> 30#include <pwd.h>
@@ -40,8 +32,17 @@
40#include <setjmp.h> 32#include <setjmp.h>
41#include <sys/resource.h> 33#include <sys/resource.h>
42#include <unistd.h> 34#include <unistd.h>
35#include <stdarg.h>
43#include <string.h> 36#include <string.h>
44 37
38#include "ssh.h"
39#include "auth.h"
40#include "auth-sia.h"
41#include "log.h"
42#include "servconf.h"
43#include "canohost.h"
44#include "uidswap.h"
45
45extern ServerOptions options; 46extern ServerOptions options;
46extern int saved_argc; 47extern int saved_argc;
47extern char **saved_argv; 48extern char **saved_argv;
diff --git a/auth1.c b/auth1.c
index 34dcf6266..b9d6b1115 100644
--- a/auth1.c
+++ b/auth1.c
@@ -14,6 +14,7 @@
14 14
15#include <sys/types.h> 15#include <sys/types.h>
16 16
17#include <stdarg.h>
17#include <stdio.h> 18#include <stdio.h>
18#include <string.h> 19#include <string.h>
19#include <unistd.h> 20#include <unistd.h>
diff --git a/auth2-chall.c b/auth2-chall.c
index b091957b1..b78b739cd 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -28,6 +28,7 @@
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30 30
31#include <stdarg.h>
31#include <stdio.h> 32#include <stdio.h>
32#include <string.h> 33#include <string.h>
33 34
diff --git a/auth2-gss.c b/auth2-gss.c
index d88bc4273..c77c841a3 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -30,6 +30,8 @@
30 30
31#include <sys/types.h> 31#include <sys/types.h>
32 32
33#include <stdarg.h>
34
33#include "xmalloc.h" 35#include "xmalloc.h"
34#include "key.h" 36#include "key.h"
35#include "hostfile.h" 37#include "hostfile.h"
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 901596484..a4fc9e6f7 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -27,6 +27,8 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdarg.h>
31
30#include "xmalloc.h" 32#include "xmalloc.h"
31#include "packet.h" 33#include "packet.h"
32#include "key.h" 34#include "key.h"
diff --git a/auth2-none.c b/auth2-none.c
index f455bdde3..952b44824 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -30,6 +30,7 @@
30#include <sys/uio.h> 30#include <sys/uio.h>
31 31
32#include <fcntl.h> 32#include <fcntl.h>
33#include <stdarg.h>
33#include <unistd.h> 34#include <unistd.h>
34 35
35#include "xmalloc.h" 36#include "xmalloc.h"
diff --git a/authfd.c b/authfd.c
index 5c910df13..61faad123 100644
--- a/authfd.c
+++ b/authfd.c
@@ -47,6 +47,7 @@
47#include <fcntl.h> 47#include <fcntl.h>
48#include <stdlib.h> 48#include <stdlib.h>
49#include <signal.h> 49#include <signal.h>
50#include <stdarg.h>
50#include <string.h> 51#include <string.h>
51#include <unistd.h> 52#include <unistd.h>
52 53
diff --git a/authfile.c b/authfile.c
index 675085646..735c64780 100644
--- a/authfile.c
+++ b/authfile.c
@@ -49,6 +49,7 @@
49 49
50#include <errno.h> 50#include <errno.h>
51#include <fcntl.h> 51#include <fcntl.h>
52#include <stdarg.h>
52#include <stdio.h> 53#include <stdio.h>
53#include <stdlib.h> 54#include <stdlib.h>
54#include <string.h> 55#include <string.h>
diff --git a/cipher-3des1.c b/cipher-3des1.c
index 61798bfde..fc16e20d7 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -29,6 +29,7 @@
29 29
30#include <openssl/evp.h> 30#include <openssl/evp.h>
31 31
32#include <stdarg.h>
32#include <string.h> 33#include <string.h>
33 34
34#include "xmalloc.h" 35#include "xmalloc.h"
diff --git a/cipher-aes.c b/cipher-aes.c
index 99e9eea92..14ef10f03 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -28,8 +28,12 @@
28#include "openbsd-compat/openssl-compat.h" 28#include "openbsd-compat/openssl-compat.h"
29 29
30#ifdef USE_BUILTIN_RIJNDAEL 30#ifdef USE_BUILTIN_RIJNDAEL
31#include <sys/types.h>
31 32
32#include <openssl/evp.h> 33#include <openssl/evp.h>
34
35#include <stdarg.h>
36
33#include "rijndael.h" 37#include "rijndael.h"
34#include "xmalloc.h" 38#include "xmalloc.h"
35#include "log.h" 39#include "log.h"
diff --git a/cipher-bf1.c b/cipher-bf1.c
index eb4c04777..292488c5c 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -29,6 +29,7 @@
29 29
30#include <openssl/evp.h> 30#include <openssl/evp.h>
31 31
32#include <stdarg.h>
32#include <string.h> 33#include <string.h>
33 34
34#include "xmalloc.h" 35#include "xmalloc.h"
diff --git a/cipher-ctr.c b/cipher-ctr.c
index 9733b7d56..b24f3a428 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -18,6 +18,7 @@
18 18
19#include <sys/types.h> 19#include <sys/types.h>
20 20
21#include <stdarg.h>
21#include <string.h> 22#include <string.h>
22 23
23#include <openssl/evp.h> 24#include <openssl/evp.h>
diff --git a/clientloop.c b/clientloop.c
index 132d75a44..88dfb1f32 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -78,6 +78,7 @@
78#include <paths.h> 78#include <paths.h>
79#endif 79#endif
80#include <signal.h> 80#include <signal.h>
81#include <stdarg.h>
81#include <stdio.h> 82#include <stdio.h>
82#include <stdlib.h> 83#include <stdlib.h>
83#include <string.h> 84#include <string.h>
diff --git a/dh.c b/dh.c
index 925eedddf..f6ef05cf6 100644
--- a/dh.c
+++ b/dh.c
@@ -30,6 +30,7 @@
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
32 32
33#include <stdarg.h>
33#include <stdio.h> 34#include <stdio.h>
34#include <stdlib.h> 35#include <stdlib.h>
35#include <string.h> 36#include <string.h>
diff --git a/dns.c b/dns.c
index 229210835..92623de72 100644
--- a/dns.c
+++ b/dns.c
@@ -31,6 +31,7 @@
31#include <sys/socket.h> 31#include <sys/socket.h>
32 32
33#include <netdb.h> 33#include <netdb.h>
34#include <stdarg.h>
34#include <stdio.h> 35#include <stdio.h>
35#include <string.h> 36#include <string.h>
36 37
diff --git a/entropy.c b/entropy.c
index c89e0b528..4f19c8767 100644
--- a/entropy.c
+++ b/entropy.c
@@ -34,6 +34,7 @@
34#ifdef HAVE_FCNTL_H 34#ifdef HAVE_FCNTL_H
35# include <fcntl.h> 35# include <fcntl.h>
36#endif 36#endif
37#include <stdarg.h>
37#include <unistd.h> 38#include <unistd.h>
38 39
39#include <openssl/rand.h> 40#include <openssl/rand.h>
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 006bedad9..5a625acb8 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -31,6 +31,7 @@
31 31
32#include <sys/types.h> 32#include <sys/types.h>
33 33
34#include <stdarg.h>
34#include <string.h> 35#include <string.h>
35 36
36#include "xmalloc.h" 37#include "xmalloc.h"
diff --git a/gss-serv.c b/gss-serv.c
index 296f63a89..e8191a859 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -30,6 +30,7 @@
30 30
31#include <sys/types.h> 31#include <sys/types.h>
32 32
33#include <stdarg.h>
33#include <string.h> 34#include <string.h>
34#include <unistd.h> 35#include <unistd.h>
35 36
diff --git a/hostfile.c b/hostfile.c
index 08ba44264..2cceb352a 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -46,6 +46,7 @@
46#include <openssl/sha.h> 46#include <openssl/sha.h>
47 47
48#include <resolv.h> 48#include <resolv.h>
49#include <stdarg.h>
49#include <stdio.h> 50#include <stdio.h>
50#include <stdlib.h> 51#include <stdlib.h>
51#include <string.h> 52#include <string.h>
diff --git a/kex.c b/kex.c
index 0c36519a1..bfc1c11f9 100644
--- a/kex.c
+++ b/kex.c
@@ -28,6 +28,7 @@
28#include <sys/param.h> 28#include <sys/param.h>
29 29
30#include <signal.h> 30#include <signal.h>
31#include <stdarg.h>
31#include <stdio.h> 32#include <stdio.h>
32#include <stdlib.h> 33#include <stdlib.h>
33#include <string.h> 34#include <string.h>
diff --git a/kexdhc.c b/kexdhc.c
index bf875ae07..64de7af30 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -27,6 +27,7 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdarg.h>
30#include <stdio.h> 31#include <stdio.h>
31#include <string.h> 32#include <string.h>
32#include <signal.h> 33#include <signal.h>
diff --git a/kexdhs.c b/kexdhs.c
index 7d2c21eed..93ec97f93 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -26,6 +26,8 @@
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29
30#include <stdarg.h>
29#include <string.h> 31#include <string.h>
30#include <signal.h> 32#include <signal.h>
31 33
diff --git a/kexgexc.c b/kexgexc.c
index fc48880d4..2c19713e1 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -28,6 +28,7 @@
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30 30
31#include <stdarg.h>
31#include <stdio.h> 32#include <stdio.h>
32#include <string.h> 33#include <string.h>
33#include <signal.h> 34#include <signal.h>
diff --git a/kexgexs.c b/kexgexs.c
index 7599f2af4..5373a633a 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -28,6 +28,7 @@
28 28
29#include <sys/param.h> 29#include <sys/param.h>
30 30
31#include <stdarg.h>
31#include <stdio.h> 32#include <stdio.h>
32#include <string.h> 33#include <string.h>
33#include <signal.h> 34#include <signal.h>
diff --git a/key.c b/key.c
index 40aab20ea..f3b3d6b94 100644
--- a/key.c
+++ b/key.c
@@ -39,6 +39,7 @@
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
42#include <stdarg.h>
42#include <stdio.h> 43#include <stdio.h>
43#include <string.h> 44#include <string.h>
44 45
diff --git a/loginrec.c b/loginrec.c
index 7850312b6..67447edc0 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -156,6 +156,7 @@
156#include <errno.h> 156#include <errno.h>
157#include <fcntl.h> 157#include <fcntl.h>
158#include <pwd.h> 158#include <pwd.h>
159#include <stdarg.h>
159#include <string.h> 160#include <string.h>
160#include <unistd.h> 161#include <unistd.h>
161 162
diff --git a/mac.c b/mac.c
index edf9b69bd..e5d5bfa88 100644
--- a/mac.c
+++ b/mac.c
@@ -29,6 +29,7 @@
29 29
30#include <openssl/hmac.h> 30#include <openssl/hmac.h>
31 31
32#include <stdarg.h>
32#include <string.h> 33#include <string.h>
33#include <signal.h> 34#include <signal.h>
34 35
diff --git a/md5crypt.c b/md5crypt.c
index 253fdfdf2..22ef98933 100644
--- a/md5crypt.c
+++ b/md5crypt.c
@@ -11,6 +11,10 @@
11#include "includes.h" 11#include "includes.h"
12 12
13#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) 13#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
14#include <sys/types.h>
15
16#include <string.h>
17
14#include <openssl/md5.h> 18#include <openssl/md5.h>
15 19
16/* 0 ... 63 => ascii - 64 */ 20/* 0 ... 63 => ascii - 64 */
diff --git a/monitor.c b/monitor.c
index 83b3765a0..b3ccde017 100644
--- a/monitor.c
+++ b/monitor.c
@@ -40,6 +40,7 @@
40#endif 40#endif
41#include <pwd.h> 41#include <pwd.h>
42#include <signal.h> 42#include <signal.h>
43#include <stdarg.h>
43#include <stdlib.h> 44#include <stdlib.h>
44#include <string.h> 45#include <string.h>
45 46
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 431b3e495..3865539df 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -33,6 +33,7 @@
33#include <errno.h> 33#include <errno.h>
34#include <pwd.h> 34#include <pwd.h>
35#include <signal.h> 35#include <signal.h>
36#include <stdarg.h>
36#include <stdio.h> 37#include <stdio.h>
37#include <string.h> 38#include <string.h>
38#include <unistd.h> 39#include <unistd.h>
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index 8093f6d54..1532c991c 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: bsd-cray.c,v 1.15 2006/07/24 05:08:36 djm Exp $ 2 * $Id: bsd-cray.c,v 1.16 2006/09/01 05:38:41 djm Exp $
3 * 3 *
4 * bsd-cray.c 4 * bsd-cray.c
5 * 5 *
@@ -52,6 +52,7 @@
52#include <sys/secstat.h> 52#include <sys/secstat.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/session.h> 54#include <sys/session.h>
55#include <stdarg.h>
55#include <stdlib.h> 56#include <stdlib.h>
56#include <string.h> 57#include <string.h>
57#include <unistd.h> 58#include <unistd.h>
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 13a73e873..d0a423005 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -41,6 +41,7 @@
41# include <netdb.h> 41# include <netdb.h>
42#endif 42#endif
43#include <uinfo.h> 43#include <uinfo.h>
44#include <stdarg.h>
44#include <string.h> 45#include <string.h>
45#include <unistd.h> 46#include <unistd.h>
46#include <sys/socket.h> 47#include <sys/socket.h>
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 5e2e878dc..77f3a1c17 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
1/* $Id: port-linux.c,v 1.2 2006/07/24 04:51:01 djm Exp $ */ 1/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -24,6 +24,7 @@
24#include "includes.h" 24#include "includes.h"
25 25
26#include <errno.h> 26#include <errno.h>
27#include <stdarg.h>
27#include <string.h> 28#include <string.h>
28 29
29#ifdef WITH_SELINUX 30#ifdef WITH_SELINUX
diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c
index f31f0c6ea..f57433e78 100644
--- a/openbsd-compat/port-solaris.c
+++ b/openbsd-compat/port-solaris.c
@@ -1,4 +1,4 @@
1/* $Id: port-solaris.c,v 1.1 2006/08/30 17:24:42 djm Exp $ */ 1/* $Id: port-solaris.c,v 1.2 2006/09/01 05:38:41 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 Chad Mynhier. 4 * Copyright (c) 2006 Chad Mynhier.
@@ -29,6 +29,7 @@
29#ifdef HAVE_FCNTL_H 29#ifdef HAVE_FCNTL_H
30# include <fcntl.h> 30# include <fcntl.h>
31#endif 31#endif
32#include <stdarg.h>
32#include <string.h> 33#include <string.h>
33#include <unistd.h> 34#include <unistd.h>
34 35
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c
index c64427121..6f3523902 100644
--- a/openbsd-compat/port-uw.c
+++ b/openbsd-compat/port-uw.c
@@ -26,15 +26,26 @@
26#include "includes.h" 26#include "includes.h"
27 27
28#ifdef HAVE_LIBIAF 28#ifdef HAVE_LIBIAF
29#include <sys/types.h>
29#ifdef HAVE_CRYPT_H 30#ifdef HAVE_CRYPT_H
30#include <crypt.h> 31# include <crypt.h>
31#endif 32#endif
33#include <pwd.h>
34#include <stdarg.h>
35#include <stdlib.h>
36#include <stdio.h>
37#include <string.h>
38
39#include "xmalloc.h"
32#include "packet.h" 40#include "packet.h"
33#include "buffer.h" 41#include "buffer.h"
42#include "auth-options.h"
34#include "log.h" 43#include "log.h"
35#include "servconf.h" 44#include "servconf.h"
45#include "key.h"
46#include "hostfile.h"
36#include "auth.h" 47#include "auth.h"
37#include "auth-options.h" 48#include "ssh.h"
38 49
39int nischeck(char *); 50int nischeck(char *);
40 51
diff --git a/readconf.c b/readconf.c
index c57ea0c82..4cacf6026 100644
--- a/readconf.c
+++ b/readconf.c
@@ -24,6 +24,7 @@
24#include <errno.h> 24#include <errno.h>
25#include <netdb.h> 25#include <netdb.h>
26#include <signal.h> 26#include <signal.h>
27#include <stdarg.h>
27#include <stdio.h> 28#include <stdio.h>
28#include <string.h> 29#include <string.h>
29#include <unistd.h> 30#include <unistd.h>
diff --git a/rsa.c b/rsa.c
index 875b486c4..08cc82007 100644
--- a/rsa.c
+++ b/rsa.c
@@ -64,6 +64,7 @@
64 64
65#include <sys/types.h> 65#include <sys/types.h>
66 66
67#include <stdarg.h>
67#include <string.h> 68#include <string.h>
68 69
69#include "xmalloc.h" 70#include "xmalloc.h"
diff --git a/scard-opensc.c b/scard-opensc.c
index 7a496dff8..4751ea295 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -26,9 +26,13 @@
26#include "includes.h" 26#include "includes.h"
27#if defined(SMARTCARD) && defined(USE_OPENSC) 27#if defined(SMARTCARD) && defined(USE_OPENSC)
28 28
29#include <sys/types.h>
30
29#include <openssl/evp.h> 31#include <openssl/evp.h>
30#include <openssl/x509.h> 32#include <openssl/x509.h>
31 33
34#include <stdarg.h>
35
32#include <opensc/opensc.h> 36#include <opensc/opensc.h>
33#include <opensc/pkcs15.h> 37#include <opensc/pkcs15.h>
34 38
diff --git a/scard.c b/scard.c
index a2d28cba1..328655edd 100644
--- a/scard.c
+++ b/scard.c
@@ -29,6 +29,7 @@
29#include <sys/types.h> 29#include <sys/types.h>
30 30
31#include <sectok.h> 31#include <sectok.h>
32#include <stdarg.h>
32#include <string.h> 33#include <string.h>
33 34
34#include <openssl/evp.h> 35#include <openssl/evp.h>
diff --git a/session.c b/session.c
index 006e4304d..15c5ca9a0 100644
--- a/session.c
+++ b/session.c
@@ -53,6 +53,7 @@
53#endif 53#endif
54#include <pwd.h> 54#include <pwd.h>
55#include <signal.h> 55#include <signal.h>
56#include <stdarg.h>
56#include <stdio.h> 57#include <stdio.h>
57#include <stdlib.h> 58#include <stdlib.h>
58#include <string.h> 59#include <string.h>
diff --git a/ssh-add.c b/ssh-add.c
index 518f47066..4dc46f6db 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -45,6 +45,7 @@
45 45
46#include <fcntl.h> 46#include <fcntl.h>
47#include <pwd.h> 47#include <pwd.h>
48#include <stdarg.h>
48#include <stdio.h> 49#include <stdio.h>
49#include <stdlib.h> 50#include <stdlib.h>
50#include <string.h> 51#include <string.h>
diff --git a/ssh-agent.c b/ssh-agent.c
index 6bc1e541a..08b07212e 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -58,6 +58,7 @@
58# include <paths.h> 58# include <paths.h>
59#endif 59#endif
60#include <signal.h> 60#include <signal.h>
61#include <stdarg.h>
61#include <stdio.h> 62#include <stdio.h>
62#include <stdlib.h> 63#include <stdlib.h>
63#include <time.h> 64#include <time.h>
diff --git a/ssh-dss.c b/ssh-dss.c
index 448f704f6..fbc078e84 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -30,6 +30,7 @@
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/evp.h> 31#include <openssl/evp.h>
32 32
33#include <stdarg.h>
33#include <string.h> 34#include <string.h>
34 35
35#include "xmalloc.h" 36#include "xmalloc.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index c607e257e..969bd2359 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -29,6 +29,7 @@
29# include <paths.h> 29# include <paths.h>
30#endif 30#endif
31#include <pwd.h> 31#include <pwd.h>
32#include <stdarg.h>
32#include <stdio.h> 33#include <stdio.h>
33#include <stdlib.h> 34#include <stdlib.h>
34#include <string.h> 35#include <string.h>
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 1ddb2a058..c4bc7e56e 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -30,6 +30,7 @@
30#include <paths.h> 30#include <paths.h>
31#endif 31#endif
32#include <pwd.h> 32#include <pwd.h>
33#include <stdarg.h>
33#include <stdlib.h> 34#include <stdlib.h>
34#include <string.h> 35#include <string.h>
35#include <unistd.h> 36#include <unistd.h>
diff --git a/ssh-rsa.c b/ssh-rsa.c
index 28444c1f9..0e16ff85f 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -22,6 +22,7 @@
22#include <openssl/evp.h> 22#include <openssl/evp.h>
23#include <openssl/err.h> 23#include <openssl/err.h>
24 24
25#include <stdarg.h>
25#include <string.h> 26#include <string.h>
26 27
27#include "xmalloc.h" 28#include "xmalloc.h"
diff --git a/ssh.c b/ssh.c
index 07a4ca3c8..a34990b54 100644
--- a/ssh.c
+++ b/ssh.c
@@ -60,6 +60,7 @@
60#endif 60#endif
61#include <pwd.h> 61#include <pwd.h>
62#include <signal.h> 62#include <signal.h>
63#include <stdarg.h>
63#include <stddef.h> 64#include <stddef.h>
64#include <stdio.h> 65#include <stdio.h>
65#include <stdlib.h> 66#include <stdlib.h>
diff --git a/sshconnect.c b/sshconnect.c
index 71ca4ec52..823def6a9 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -32,6 +32,7 @@
32#include <paths.h> 32#include <paths.h>
33#endif 33#endif
34#include <pwd.h> 34#include <pwd.h>
35#include <stdarg.h>
35#include <stdio.h> 36#include <stdio.h>
36#include <stdlib.h> 37#include <stdlib.h>
37#include <string.h> 38#include <string.h>
diff --git a/sshconnect1.c b/sshconnect1.c
index 51f1f8088..90fcb344f 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -21,6 +21,7 @@
21#include <openssl/bn.h> 21#include <openssl/bn.h>
22#include <openssl/md5.h> 22#include <openssl/md5.h>
23 23
24#include <stdarg.h>
24#include <stdio.h> 25#include <stdio.h>
25#include <stdlib.h> 26#include <stdlib.h>
26#include <string.h> 27#include <string.h>
diff --git a/sshconnect2.c b/sshconnect2.c
index 5846c8e9c..dd971a9f9 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -33,6 +33,7 @@
33#include <errno.h> 33#include <errno.h>
34#include <pwd.h> 34#include <pwd.h>
35#include <signal.h> 35#include <signal.h>
36#include <stdarg.h>
36#include <stdio.h> 37#include <stdio.h>
37#include <string.h> 38#include <string.h>
38#include <unistd.h> 39#include <unistd.h>
diff --git a/sshd.c b/sshd.c
index ee588ff8a..3fb146424 100644
--- a/sshd.c
+++ b/sshd.c
@@ -65,6 +65,7 @@
65#include <grp.h> 65#include <grp.h>
66#include <pwd.h> 66#include <pwd.h>
67#include <signal.h> 67#include <signal.h>
68#include <stdarg.h>
68#include <stdio.h> 69#include <stdio.h>
69#include <stdlib.h> 70#include <stdlib.h>
70#include <string.h> 71#include <string.h>