diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-15 11:40:10 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-15 11:40:10 +1100 |
commit | 574c41fdb3ff4b8eb7f121b05a08f2415ec7efec (patch) | |
tree | da6082bcb028dd2d9df5fd1123dd8c0658fd5f7a | |
parent | 5c853b531f3e2af1aa38d1a911529ecc9511c341 (diff) |
- stevesk@cvs.openbsd.org 2006/02/20 16:36:15
[authfd.c channels.c includes.h session.c ssh-agent.c ssh.c]
move #include <sys/un.h> out of includes.h; ok djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | authfd.c | 5 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | includes.h | 5 | ||||
-rw-r--r-- | session.c | 3 | ||||
-rw-r--r-- | ssh-agent.c | 8 | ||||
-rw-r--r-- | ssh.c | 4 |
7 files changed, 23 insertions, 11 deletions
@@ -132,6 +132,9 @@ | |||
132 | - jmc@cvs.openbsd.org 2006/02/19 20:12:25 | 132 | - jmc@cvs.openbsd.org 2006/02/19 20:12:25 |
133 | [ssh_config.5] | 133 | [ssh_config.5] |
134 | add some vertical space; | 134 | add some vertical space; |
135 | - stevesk@cvs.openbsd.org 2006/02/20 16:36:15 | ||
136 | [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c] | ||
137 | move #include <sys/un.h> out of includes.h; ok djm@ | ||
135 | 138 | ||
136 | 20060313 | 139 | 20060313 |
137 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 140 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4033,4 +4036,4 @@ | |||
4033 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4036 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4034 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4037 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4035 | 4038 | ||
4036 | $Id: ChangeLog,v 1.4177 2006/03/15 00:37:02 djm Exp $ | 4039 | $Id: ChangeLog,v 1.4178 2006/03/15 00:40:10 djm Exp $ |
@@ -35,7 +35,10 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.66 2005/06/17 02:44:32 djm Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.67 2006/02/20 16:36:14 stevesk Exp $"); |
39 | |||
40 | #include <sys/types.h> | ||
41 | #include <sys/un.h> | ||
39 | 42 | ||
40 | #include <openssl/evp.h> | 43 | #include <openssl/evp.h> |
41 | 44 | ||
diff --git a/channels.c b/channels.c index 3955b6158..7161b9413 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,9 +39,11 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.234 2006/02/10 00:27:13 stevesk Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.235 2006/02/20 16:36:14 stevesk Exp $"); |
43 | 43 | ||
44 | #include <sys/ioctl.h> | 44 | #include <sys/ioctl.h> |
45 | #include <sys/types.h> | ||
46 | #include <sys/un.h> | ||
45 | 47 | ||
46 | #include <termios.h> | 48 | #include <termios.h> |
47 | 49 | ||
diff --git a/includes.h b/includes.h index 1dbe16b78..ef4a269cc 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.33 2006/02/10 01:44:26 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.34 2006/02/20 16:36:14 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -102,9 +102,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } | |||
102 | # include <sys/bsdtty.h> | 102 | # include <sys/bsdtty.h> |
103 | #endif | 103 | #endif |
104 | #include <sys/param.h> /* For MAXPATHLEN and roundup() */ | 104 | #include <sys/param.h> /* For MAXPATHLEN and roundup() */ |
105 | #ifdef HAVE_SYS_UN_H | ||
106 | # include <sys/un.h> /* For sockaddr_un */ | ||
107 | #endif | ||
108 | #ifdef HAVE_STDINT_H | 105 | #ifdef HAVE_STDINT_H |
109 | # include <stdint.h> | 106 | # include <stdint.h> |
110 | #endif | 107 | #endif |
@@ -33,10 +33,11 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.193 2006/02/10 01:44:27 stevesk Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.194 2006/02/20 16:36:14 stevesk Exp $"); |
37 | 37 | ||
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <sys/wait.h> | 39 | #include <sys/wait.h> |
40 | #include <sys/un.h> | ||
40 | 41 | ||
41 | #include <paths.h> | 42 | #include <paths.h> |
42 | 43 | ||
diff --git a/ssh-agent.c b/ssh-agent.c index 8821e0006..0ab232191 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -34,8 +34,12 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | RCSID("$OpenBSD: ssh-agent.c,v 1.127 2006/02/08 14:31:30 stevesk Exp $"); | 37 | RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $"); |
38 | 38 | ||
39 | #include <sys/types.h> | ||
40 | #ifdef HAVE_SYS_UN_H | ||
41 | # include <sys/un.h> | ||
42 | #endif | ||
39 | #include "openbsd-compat/sys-queue.h" | 43 | #include "openbsd-compat/sys-queue.h" |
40 | #include <sys/resource.h> | 44 | #include <sys/resource.h> |
41 | #ifdef HAVE_PATHS_H | 45 | #ifdef HAVE_PATHS_H |
@@ -40,10 +40,12 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.261 2006/02/12 06:45:34 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $"); |
44 | 44 | ||
45 | #include <sys/resource.h> | 45 | #include <sys/resource.h> |
46 | #include <sys/ioctl.h> | 46 | #include <sys/ioctl.h> |
47 | #include <sys/types.h> | ||
48 | #include <sys/un.h> | ||
47 | 49 | ||
48 | #include <paths.h> | 50 | #include <paths.h> |
49 | 51 | ||