summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevesk <stevesk@openbsd.org>2006-07-03 08:54:20 +0000
committerstevesk <stevesk@openbsd.org>2006-07-03 08:54:20 +0000
commit92cfd760fff953ff49945c15223c1fd1abb24fe1 (patch)
tree718f2d95af79544dd657bbeec489f5092e8047f3
parent-p implies -n... (diff)
downloadwireguard-openbsd-92cfd760fff953ff49945c15223c1fd1abb24fe1.tar.xz
wireguard-openbsd-92cfd760fff953ff49945c15223c1fd1abb24fe1.zip
move #include "version.h" out of includes.h; ok markus@
-rw-r--r--usr.bin/ssh/includes.h4
-rw-r--r--usr.bin/ssh/ssh.c3
-rw-r--r--usr.bin/ssh/sshconnect.c3
-rw-r--r--usr.bin/ssh/sshd.c3
4 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h
index 23ba6fb997a..c49d424f40a 100644
--- a/usr.bin/ssh/includes.h
+++ b/usr.bin/ssh/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.41 2006/07/02 22:45:59 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.42 2006/07/03 08:54:20 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,6 +36,4 @@
#include <unistd.h>
#include <time.h>
-#include "version.h"
-
#endif /* INCLUDES_H */
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 39398440f62..3b4d3dd7a00 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.277 2006/07/02 17:12:58 stevesk Exp $ */
+/* $OpenBSD: ssh.c,v 1.278 2006/07/03 08:54:20 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -82,6 +82,7 @@
#include "msg.h"
#include "monitor_fdpass.h"
#include "uidswap.h"
+#include "version.h"
#ifdef SMARTCARD
#include "scard.h"
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index f3abeb578c5..3b0a5e41512 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.185 2006/06/14 10:50:42 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.186 2006/07/03 08:54:20 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -37,6 +37,7 @@
#include "atomicio.h"
#include "misc.h"
#include "dns.h"
+#include "version.h"
char *client_version_string = NULL;
char *server_version_string = NULL;
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 1291849cfaa..cbea119794c 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.331 2006/06/01 09:21:48 markus Exp $ */
+/* $OpenBSD: sshd.c,v 1.332 2006/07/03 08:54:20 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -89,6 +89,7 @@
#include "monitor.h"
#include "monitor_wrap.h"
#include "monitor_fdpass.h"
+#include "version.h"
#ifdef LIBWRAP
#include <tcpd.h>