Merge 4.0p1 to the trunk.

1 files changed, 8 insertions, 4 deletions

diff --git a/version.h b/version.h
index fb68aba60..4da5f8083 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,9 @@
-/* $OpenBSD: version.h,v 1.42 2004/08/16 08:17:01 markus Exp $ */
+/* $OpenBSD: version.h,v 1.43 2005/03/08 23:49:48 djm Exp $ */
 
-#ifndef SSH_VERSION
-#define SSH_VERSION     "OpenSSH_3.9p1"
-#endif /* SSH_VERSION */
+#define SSH_VERSION     "OpenSSH_4.0"
+
+#define SSH_PORTABLE    "p1"
+#ifndef SSH_EXTRAVERSION
+#define SSH_EXTRAVERSION
+#endif
+#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE SSH_EXTRAVERSION