summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--authfd.c3
-rw-r--r--canohost.c3
-rw-r--r--clientloop.c3
-rw-r--r--dns.c5
-rw-r--r--dns.h5
-rw-r--r--includes.h3
-rw-r--r--monitor.c1
-rw-r--r--monitor_fdpass.c4
-rw-r--r--nchan.c5
-rw-r--r--packet.c3
-rw-r--r--servconf.c5
-rw-r--r--session.c1
-rw-r--r--sftp.c3
-rw-r--r--ssh-agent.c4
-rw-r--r--ssh-keygen.c1
-rw-r--r--ssh-keyscan.c2
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.h3
-rw-r--r--sshd.c3
-rw-r--r--sshlogin.c2
-rw-r--r--sshlogin.h5
22 files changed, 54 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b850342..162881faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,11 @@
56 - stevesk@cvs.openbsd.org 2006/07/06 17:36:37 56 - stevesk@cvs.openbsd.org 2006/07/06 17:36:37
57 [monitor_wrap.h] 57 [monitor_wrap.h]
58 typo in comment 58 typo in comment
59 - stevesk@cvs.openbsd.org 2006/07/08 21:47:12
60 [authfd.c canohost.c clientloop.c dns.c dns.h includes.h]
61 [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c]
62 [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h]
63 move #include <sys/socket.h> out of includes.h
59 64
6020060706 6520060706
61 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 66 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4789,4 +4794,4 @@
4789 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4794 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4790 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4795 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4791 4796
4792$Id: ChangeLog,v 1.4373 2006/07/10 10:53:45 djm Exp $ 4797$Id: ChangeLog,v 1.4374 2006/07/10 11:08:03 djm Exp $
diff --git a/authfd.c b/authfd.c
index 0fa69bd2a..0d2b09ecc 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.74 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: authfd.c,v 1.75 2006/07/08 21:47:12 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
@@ -39,6 +39,7 @@
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/un.h> 41#include <sys/un.h>
42#include <sys/socket.h>
42 43
43#include <openssl/evp.h> 44#include <openssl/evp.h>
44 45
diff --git a/canohost.c b/canohost.c
index 787d338d4..538b141b1 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: canohost.c,v 1.54 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: canohost.c,v 1.55 2006/07/08 21:47:12 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
@@ -14,6 +14,7 @@
14 14
15#include "includes.h" 15#include "includes.h"
16 16
17#include <sys/types.h>
17#include <sys/socket.h> 18#include <sys/socket.h>
18 19
19#include <netinet/in.h> 20#include <netinet/in.h>
diff --git a/clientloop.c b/clientloop.c
index fb66a6e40..c59d573c5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.165 2006/07/02 23:01:55 stevesk Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.166 2006/07/08 21:47:12 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
@@ -65,6 +65,7 @@
65#ifdef HAVE_SYS_STAT_H 65#ifdef HAVE_SYS_STAT_H
66# include <sys/stat.h> 66# include <sys/stat.h>
67#endif 67#endif
68#include <sys/socket.h>
68#include <sys/ioctl.h> 69#include <sys/ioctl.h>
69 70
70#include <ctype.h> 71#include <ctype.h>
diff --git a/dns.c b/dns.c
index 69084b57d..504b5d72e 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.19 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: dns.c,v 1.20 2006/07/08 21:47:12 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -27,6 +27,9 @@
27 27
28#include "includes.h" 28#include "includes.h"
29 29
30#include <sys/types.h>
31#include <sys/socket.h>
32
30#include <netdb.h> 33#include <netdb.h>
31 34
32#include "xmalloc.h" 35#include "xmalloc.h"
diff --git a/dns.h b/dns.h
index 305ca07fb..818750384 100644
--- a/dns.h
+++ b/dns.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.h,v 1.7 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: dns.h,v 1.8 2006/07/08 21:47:12 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -27,6 +27,9 @@
27 27
28#include "includes.h" 28#include "includes.h"
29 29
30#include <sys/types.h>
31#include <sys/socket.h>
32
30#ifndef DNS_H 33#ifndef DNS_H
31#define DNS_H 34#define DNS_H
32 35
diff --git a/includes.h b/includes.h
index 55ca7bedd..417d7c01b 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.45 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.46 2006/07/08 21:47:12 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -87,7 +87,6 @@
87#endif 87#endif
88 88
89#include <sys/types.h> 89#include <sys/types.h>
90#include <sys/socket.h>
91#ifdef HAVE_SYS_TIME_H 90#ifdef HAVE_SYS_TIME_H
92# include <sys/time.h> /* For timersub */ 91# include <sys/time.h> /* For timersub */
93#endif 92#endif
diff --git a/monitor.c b/monitor.c
index 72176f9aa..4a295d312 100644
--- a/monitor.c
+++ b/monitor.c
@@ -28,6 +28,7 @@
28#include "includes.h" 28#include "includes.h"
29 29
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/socket.h>
31#include <sys/wait.h> 32#include <sys/wait.h>
32 33
33#ifdef HAVE_PATHS_H 34#ifdef HAVE_PATHS_H
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 4ce9eae19..546f7010f 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_fdpass.c,v 1.8 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: monitor_fdpass.c,v 1.9 2006/07/08 21:47:12 stevesk Exp $ */
2/* 2/*
3 * Copyright 2001 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved. 4 * All rights reserved.
@@ -26,6 +26,8 @@
26 26
27#include "includes.h" 27#include "includes.h"
28 28
29#include <sys/types.h>
30#include <sys/socket.h>
29#include <sys/uio.h> 31#include <sys/uio.h>
30 32
31#include "log.h" 33#include "log.h"
diff --git a/nchan.c b/nchan.c
index 1f4b39671..58b0e98d5 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: nchan.c,v 1.53 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: nchan.c,v 1.54 2006/07/08 21:47:12 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,9 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
29#include <sys/socket.h>
30
28#include "ssh1.h" 31#include "ssh1.h"
29#include "ssh2.h" 32#include "ssh2.h"
30#include "buffer.h" 33#include "buffer.h"
diff --git a/packet.c b/packet.c
index ba2843786..f04d6fac9 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.132 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: packet.c,v 1.133 2006/07/08 21:47:12 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
@@ -39,6 +39,7 @@
39 39
40#include "includes.h" 40#include "includes.h"
41 41
42#include <sys/types.h>
42#include "openbsd-compat/sys-queue.h" 43#include "openbsd-compat/sys-queue.h"
43#include <sys/socket.h> 44#include <sys/socket.h>
44 45
diff --git a/servconf.c b/servconf.c
index af0ad1a35..c5b933ab9 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.151 2006/07/06 10:47:05 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.152 2006/07/08 21:47:12 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -12,6 +12,9 @@
12 12
13#include "includes.h" 13#include "includes.h"
14 14
15#include <sys/types.h>
16#include <sys/socket.h>
17
15#include "ssh.h" 18#include "ssh.h"
16#include "log.h" 19#include "log.h"
17#include "servconf.h" 20#include "servconf.h"
diff --git a/session.c b/session.c
index 9115c5aa1..8b1a9ed94 100644
--- a/session.c
+++ b/session.c
@@ -39,6 +39,7 @@
39#ifdef HAVE_SYS_STAT_H 39#ifdef HAVE_SYS_STAT_H
40# include <sys/stat.h> 40# include <sys/stat.h>
41#endif 41#endif
42#include <sys/socket.h>
42#include <sys/wait.h> 43#include <sys/wait.h>
43#include <sys/un.h> 44#include <sys/un.h>
44 45
diff --git a/sftp.c b/sftp.c
index 22fa6ad2a..a6c22aa67 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.82 2006/05/17 12:43:34 markus Exp $ */ 1/* $OpenBSD: sftp.c,v 1.83 2006/07/08 21:47:12 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -22,6 +22,7 @@
22# include <sys/stat.h> 22# include <sys/stat.h>
23#endif 23#endif
24#include <sys/ioctl.h> 24#include <sys/ioctl.h>
25#include <sys/socket.h>
25#include <sys/wait.h> 26#include <sys/wait.h>
26 27
27#ifdef HAVE_PATHS_H 28#ifdef HAVE_PATHS_H
diff --git a/ssh-agent.c b/ssh-agent.c
index db3935ec7..87e94b0ea 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.140 2006/06/13 02:17:07 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.141 2006/07/08 21:47:12 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
@@ -38,11 +38,13 @@
38 38
39#include <sys/types.h> 39#include <sys/types.h>
40#include <sys/stat.h> 40#include <sys/stat.h>
41#include <sys/socket.h>
41#ifdef HAVE_SYS_UN_H 42#ifdef HAVE_SYS_UN_H
42# include <sys/un.h> 43# include <sys/un.h>
43#endif 44#endif
44#include "openbsd-compat/sys-queue.h" 45#include "openbsd-compat/sys-queue.h"
45#include <sys/resource.h> 46#include <sys/resource.h>
47
46#ifdef HAVE_PATHS_H 48#ifdef HAVE_PATHS_H
47# include <paths.h> 49# include <paths.h>
48#endif 50#endif
diff --git a/ssh-keygen.c b/ssh-keygen.c
index aa2030ea7..afa718a96 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -15,6 +15,7 @@
15#include "includes.h" 15#include "includes.h"
16 16
17#include <sys/types.h> 17#include <sys/types.h>
18#include <sys/socket.h>
18#include <sys/stat.h> 19#include <sys/stat.h>
19 20
20#include <openssl/evp.h> 21#include <openssl/evp.h>
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index dc47a9576..85ee168e7 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.64 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.65 2006/07/08 21:47:12 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 *
diff --git a/ssh.c b/ssh.c
index d9837f162..ee4f92f92 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.279 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: ssh.c,v 1.280 2006/07/08 21:47:12 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
@@ -48,6 +48,7 @@
48#endif 48#endif
49#include <sys/resource.h> 49#include <sys/resource.h>
50#include <sys/ioctl.h> 50#include <sys/ioctl.h>
51#include <sys/socket.h>
51#include <sys/un.h> 52#include <sys/un.h>
52 53
53#include <ctype.h> 54#include <ctype.h>
diff --git a/sshconnect.h b/sshconnect.h
index c1b07390b..0b3896f9d 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.h,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.h,v 1.22 2006/07/08 21:47:12 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -27,6 +27,7 @@
27#define SSHCONNECT_H 27#define SSHCONNECT_H
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/socket.h>
30 31
31#include <pwd.h> 32#include <pwd.h>
32 33
diff --git a/sshd.c b/sshd.c
index 790d27576..4131f1699 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.333 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: sshd.c,v 1.334 2006/07/08 21:47:12 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
@@ -49,6 +49,7 @@
49# include <sys/stat.h> 49# include <sys/stat.h>
50#endif 50#endif
51#include <sys/ioctl.h> 51#include <sys/ioctl.h>
52#include <sys/socket.h>
52#include <sys/wait.h> 53#include <sys/wait.h>
53 54
54#ifdef HAVE_PATHS_H 55#ifdef HAVE_PATHS_H
diff --git a/sshlogin.c b/sshlogin.c
index 4f65b5e91..a472b511c 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -119,7 +119,7 @@ record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
119#ifdef LOGIN_NEEDS_UTMPX 119#ifdef LOGIN_NEEDS_UTMPX
120void 120void
121record_utmp_only(pid_t pid, const char *ttyname, const char *user, 121record_utmp_only(pid_t pid, const char *ttyname, const char *user,
122 const char *host, struct sockaddr * addr, socklen_t addrlen) 122 const char *host, struct sockaddr *addr, socklen_t addrlen)
123{ 123{
124 struct logininfo *li; 124 struct logininfo *li;
125 125
diff --git a/sshlogin.h b/sshlogin.h
index f840461cf..c0f9cd300 100644
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshlogin.h,v 1.6 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: sshlogin.h,v 1.7 2006/07/08 21:47:12 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -14,6 +14,9 @@
14#ifndef SSHLOGIN_H 14#ifndef SSHLOGIN_H
15#define SSHLOGIN_H 15#define SSHLOGIN_H
16 16
17#include <sys/types.h>
18#include <sys/socket.h>
19
17void record_login(pid_t, const char *, const char *, uid_t, 20void record_login(pid_t, const char *, const char *, uid_t,
18 const char *, struct sockaddr *, socklen_t); 21 const char *, struct sockaddr *, socklen_t);
19void record_logout(pid_t, const char *, const char *); 22void record_logout(pid_t, const char *, const char *);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 08:06:29 +0000