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/readconf.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/readconf.c')
-rw-r--r-- | crypto/openssh/readconf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index c6c3354..35fa2d4 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -264,6 +264,7 @@ static struct { { "noneswitch", oNoneSwitch }, #endif { "versionaddendum", oVersionAddendum }, + { NULL, oBadOption } }; @@ -1092,9 +1093,9 @@ parse_int: case oNoneEnabled: intptr = &options->none_enabled; goto parse_flag; - + /* - * We check to see if the command comes from the command line or not. + * We check to see if the command comes from the command line or not. * If it does then enable it otherwise fail. NONE must never be a * default configuration. */ @@ -1110,7 +1111,7 @@ parse_int: "from the command line", filename); error("Continuing..."); return 0; - } + } #endif case oVersionAddendum: @@ -1458,7 +1459,7 @@ fill_default_options(Options * options) /* options->host_key_alias should not be set by default */ /* options->preferred_authentications will be set in ssh */ if (options->hpn_disabled == -1) - options->hpn_disabled = 0; + options->hpn_disabled = 0; if (options->hpn_buffer_size > -1) { u_int maxlen; @@ -1478,7 +1479,7 @@ fill_default_options(Options * options) } if (options->tcp_rcv_buf == 0) options->tcp_rcv_buf = 1; - if (options->tcp_rcv_buf > -1) + if (options->tcp_rcv_buf > -1) options->tcp_rcv_buf *= 1024; if (options->tcp_rcv_buf_poll == -1) options->tcp_rcv_buf_poll = 1; |