merged OpenSSH 5.3p1 to trunk

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

diff --git a/openssh/version.h b/openssh/version.h
index 76ba9a8723401bfb49918d6b245276c0d44ee791..432014a64f90808b97bc9523660c3ade39100a05 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.46 2006/02/01 11:27:22 markus Exp $ */
+/* $OpenBSD: version.h,v 1.56 2009/06/30 14:54:40 markus Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION    " GSI"
@@ -18,10 +18,11 @@
 #define MGLUE_VERSION  ""
 #endif
 
-#define SSH_VERSION    "OpenSSH_4.3"
+#define NCSA_VERSION   " GLOBUS_GSSAPI_20091001"
+
+#define SSH_VERSION    "OpenSSH_5.3"
 
 #define SSH_PORTABLE   "p1"
-#define SSH_HPN                "-hpn"
+#define SSH_HPN         "-hpn13v6"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
-                       " NCSA_GSSAPI_20060202" \
-                       GSI_VERSION KRB5_VERSION MGLUE_VERSION
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION