merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

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

diff --git a/openssh/version.h b/openssh/version.h
index d5fd0c6ce6886d5d14ef29026e272667b4663a63..1c416ad9ef8971e3fd5440988027455774aabeeb 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,6 +1,28 @@
-/* $OpenBSD: version.h,v 1.46 2006/02/01 11:27:22 markus Exp $ */
+/* $OpenBSD: version.h,v 1.55 2009/02/23 00:06:15 djm Exp $ */
 
-#define SSH_VERSION    "OpenSSH_4.3"
+#ifdef GSI
+#define GSI_VERSION    " GSI"
+#else
+#define GSI_VERSION    ""
+#endif
 
-#define SSH_PORTABLE   "p2"
-#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE
+#ifdef KRB5
+#define KRB5_VERSION   " KRB5"
+#else
+#define KRB5_VERSION   ""
+#endif
+
+#ifdef MECHGLUE
+#define MGLUE_VERSION  " MECHGLUE"
+#else
+#define MGLUE_VERSION  ""
+#endif
+
+#define NCSA_VERSION   " GLOBUS_GSSAPI_20090506"
+
+#define SSH_VERSION    "OpenSSH_5.2"
+
+#define SSH_PORTABLE   "p1"
+#define SSH_HPN         "-hpn13v6"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION