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/ssh.c | |
| 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/ssh.c')
| -rw-r--r-- | crypto/openssh/ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index 21fe19b..ed3ab92 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -437,7 +437,8 @@ main(int ac, char **av) /* FALLTHROUGH */ case 'V': fprintf(stderr, "%s, %s\n", - SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); + ssh_version_get(options.hpn_disabled), + SSLeay_version(SSLEAY_VERSION)); if (opt == 'V') exit(0); break; |
