diff options
| author | rea <rea@FreeBSD.org> | 2012-05-27 06:53:35 +0000 |
|---|---|---|
| committer | rea <rea@FreeBSD.org> | 2012-05-27 06:53:35 +0000 |
| commit | 3f61b471d9eeab488bada65727c2a1f187d8b422 (patch) | |
| tree | 44e7fea813e6ce2aabef10dcad6a1488eafdf842 /crypto/openssh/version.h | |
| parent | 498f14d067796851619b9c7684cd8944a578b080 (diff) | |
| download | FreeBSD-src-3f61b471d9eeab488bada65727c2a1f187d8b422.zip FreeBSD-src-3f61b471d9eeab488bada65727c2a1f187d8b422.tar.gz | |
OpenSSH: allow VersionAddendum to be used again
Prior to this, setting VersionAddendum will be a no-op: one will
always have BASE_VERSION + " " + VERSION_HPN for VersionAddendum
set in the config and a bare BASE_VERSION + VERSION_HPN when there
is no VersionAddendum is set.
HPN patch requires both parties to have the "hpn" inside their
advertized versions, so we add VERSION_HPN to the VERSION_BASE
if HPN is enabled and omitting it if HPN is disabled.
VersionAddendum now uses the following logics:
* unset (default value): append " " and VERSION_ADDENDUM;
* VersionAddendum is set and isn't empty: append " "
and VersionAddendum;
* VersionAddendum is set and empty: don't append anything.
Approved by: des
Reviewed by: bz
MFC after: 3 days
Diffstat (limited to 'crypto/openssh/version.h')
| -rw-r--r-- | crypto/openssh/version.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 3eb10fc..129aad4 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,13 +1,13 @@ /* $OpenBSD: version.h,v 1.62 2011/08/02 23:13:01 djm Exp $ */ /* $FreeBSD$ */ -#ifndef SSH_VERSION +#ifndef _VERSION_H_ +#define _VERSION_H_ + #define SSH_VERSION_BASE "OpenSSH_5.9p1" #define SSH_VERSION_ADDENDUM "FreeBSD-20111001" #define SSH_VERSION_HPN "_hpn13v11" -#define SSH_VERSION SSH_VERSION_BASE SSH_VERSION_HPN " " SSH_VERSION_ADDENDUM -#define SSH_RELEASE (ssh_version_get()) -const char *ssh_version_get(void); +const char *ssh_version_get(int hpn_disabled); void ssh_version_set_addendum(const char *); -#endif /* SSH_VERSION */ +#endif /* _VERSION_H_ */ |
