merged OpenSSH 5.0p1 to trunk

[gssapi-openssh.git] / openssh / version.h

diff --git a/openssh/version.h b/openssh/version.h
index f32747d4fd93999595802b901e66c49442ad0b52..68ef0edc8fe2ca2538891a2fa2eb7ae2d07fc26f 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.45 2005/08/31 09:28:42 markus Exp $ */
+/* $OpenBSD: version.h,v 1.53 2008/04/03 09:50:14 djm Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION    " GSI"
@@ -18,10 +18,11 @@
 #define MGLUE_VERSION  ""
 #endif
 
-#define SSH_VERSION    "OpenSSH_4.2"
+#define NCSA_VERSION   " NCSA_GSSAPI_20080401"
+
+#define SSH_VERSION    "OpenSSH_5.0"
 
 #define SSH_PORTABLE   "p1"
-#define SSH_HPN                "-hpn"
+#define SSH_HPN         "-hpn13v1"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
-                       " NCSA_GSSAPI_20050905" \
-                       GSI_VERSION KRB5_VERSION MGLUE_VERSION
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION