merged OpenSSH 4.6p1, openssh-4.6p1-gsskex-20070312.patch, and openssh-4.6p1-hpn12v16...

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

diff --git a/openssh/version.h b/openssh/version.h
index 792cdc757656f5ad00410140238546c37e4c5b93..ab5f1e8b9ff73a3135ea0245d16ac2e5dd79a329 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,28 @@
-/* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */
+/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */
 
-#define SSH_VERSION    "OpenSSH_3.7.1p2"       \
-                       " NCSA_GSSAPI_20040117"
+#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   " NCSA_GSSAPI_20070314"
+
+#define SSH_VERSION    "OpenSSH_4.6"
+
+#define SSH_PORTABLE   "p1"
+#define SSH_HPN         "-hpn12v16"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION