diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | ssh.c | 3 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshd.c | 3 |
5 files changed, 11 insertions, 6 deletions
@@ -23,6 +23,9 @@ | |||
23 | - stevesk@cvs.openbsd.org 2006/07/02 23:01:55 | 23 | - stevesk@cvs.openbsd.org 2006/07/02 23:01:55 |
24 | [clientloop.c ssh.1] | 24 | [clientloop.c ssh.1] |
25 | use -KR[bind_address:]port here; ok djm@ | 25 | use -KR[bind_address:]port here; ok djm@ |
26 | - stevesk@cvs.openbsd.org 2006/07/03 08:54:20 | ||
27 | [includes.h ssh.c sshconnect.c sshd.c] | ||
28 | move #include "version.h" out of includes.h; ok markus@ | ||
26 | 29 | ||
27 | 20060706 | 30 | 20060706 |
28 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 31 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4756,4 +4759,4 @@ | |||
4756 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4759 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4757 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4760 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4758 | 4761 | ||
4759 | $Id: ChangeLog,v 1.4365 2006/07/10 10:20:52 djm Exp $ | 4762 | $Id: ChangeLog,v 1.4366 2006/07/10 10:23:39 djm Exp $ |
diff --git a/includes.h b/includes.h index 3953d91a9..bb6febfe3 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.41 2006/07/02 22:45:59 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.42 2006/07/03 08:54:20 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -188,7 +188,6 @@ | |||
188 | 188 | ||
189 | #include "defines.h" | 189 | #include "defines.h" |
190 | 190 | ||
191 | #include "version.h" | ||
192 | #include "openbsd-compat/openbsd-compat.h" | 191 | #include "openbsd-compat/openbsd-compat.h" |
193 | #include "openbsd-compat/bsd-nextstep.h" | 192 | #include "openbsd-compat/bsd-nextstep.h" |
194 | 193 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.277 2006/07/02 17:12:58 stevesk Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.278 2006/07/03 08:54:20 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 |
@@ -86,6 +86,7 @@ | |||
86 | #include "msg.h" | 86 | #include "msg.h" |
87 | #include "monitor_fdpass.h" | 87 | #include "monitor_fdpass.h" |
88 | #include "uidswap.h" | 88 | #include "uidswap.h" |
89 | #include "version.h" | ||
89 | 90 | ||
90 | #ifdef SMARTCARD | 91 | #ifdef SMARTCARD |
91 | #include "scard.h" | 92 | #include "scard.h" |
diff --git a/sshconnect.c b/sshconnect.c index e26efa4dc..776460f43 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.185 2006/06/14 10:50:42 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.186 2006/07/03 08:54:20 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 | #include "atomicio.h" | 39 | #include "atomicio.h" |
40 | #include "misc.h" | 40 | #include "misc.h" |
41 | #include "dns.h" | 41 | #include "dns.h" |
42 | #include "version.h" | ||
42 | 43 | ||
43 | char *client_version_string = NULL; | 44 | char *client_version_string = NULL; |
44 | char *server_version_string = NULL; | 45 | char *server_version_string = NULL; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.331 2006/06/01 09:21:48 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.332 2006/07/03 08:54:20 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 |
@@ -97,6 +97,7 @@ | |||
97 | #include "monitor.h" | 97 | #include "monitor.h" |
98 | #include "monitor_wrap.h" | 98 | #include "monitor_wrap.h" |
99 | #include "monitor_fdpass.h" | 99 | #include "monitor_fdpass.h" |
100 | #include "version.h" | ||
100 | 101 | ||
101 | #ifdef LIBWRAP | 102 | #ifdef LIBWRAP |
102 | #include <tcpd.h> | 103 | #include <tcpd.h> |