diff options
author | ed <ed@FreeBSD.org> | 2012-02-13 11:59:59 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2012-02-13 11:59:59 +0000 |
commit | b36b72f1543152663134dbccfa40dac46c847910 (patch) | |
tree | 690ce6398942be25f1ff4d5bec5108f80bab3674 /crypto/openssh/servconf.c | |
parent | a06d0248d26b0c6b6a8db5611ade3a93483295f3 (diff) | |
download | FreeBSD-src-b36b72f1543152663134dbccfa40dac46c847910.zip FreeBSD-src-b36b72f1543152663134dbccfa40dac46c847910.tar.gz |
Polish diff against upstream.
- Revert unneeded whitespace changes.
- Revert modifications to loginrec.c, as the upstream version already
does the right thing.
- Fix indentation and whitespace of local changes.
Approved by: des
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/servconf.c')
-rw-r--r-- | crypto/openssh/servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 1d88bbf..0b7395b 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -166,7 +166,7 @@ fill_default_server_options(ServerOptions *options) _PATH_HOST_KEY_FILE; if (options->protocol & SSH_PROTO_2) { options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_RSA_KEY_FILE; + _PATH_HOST_RSA_KEY_FILE; options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE; #ifdef OPENSSL_HAS_ECC @@ -286,7 +286,7 @@ fill_default_server_options(ServerOptions *options) options->ip_qos_interactive = IPTOS_LOWDELAY; if (options->ip_qos_bulk == -1) options->ip_qos_bulk = IPTOS_THROUGHPUT; - if (options->hpn_disabled == -1) + if (options->hpn_disabled == -1) options->hpn_disabled = 0; if (options->hpn_buffer_size == -1) { /* |