merged OpenSSH 5.3p1 to trunk

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

diff --git a/openssh/version.h b/openssh/version.h
index 2b729524e220661d937c467b6b0caea4f1e392c0..432014a64f90808b97bc9523660c3ade39100a05 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.56 2009/06/30 14:54:40 markus Exp $ */
 
-#define SSH_VERSION    "OpenSSH_4.3"
+#ifdef GSI
+#define GSI_VERSION    " GSI"
+#else
+#define GSI_VERSION    ""
+#endif
+
+#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_20091001"
+
+#define SSH_VERSION    "OpenSSH_5.3"
 
 #define SSH_PORTABLE   "p1"
-#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE
+#define SSH_HPN         "-hpn13v6"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION