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/kex.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/kex.c')
| -rw-r--r-- | crypto/openssh/kex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index ca3c420..0e8d5c7 100644 --- a/crypto/openssh/kex.c +++ b/crypto/openssh/kex.c @@ -457,13 +457,13 @@ kex_choose_conf(Kex *kex) #ifdef NONE_CIPHER_ENABLED debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); if (strcmp(newkeys->enc.name, "none") == 0) { - debug("Requesting NONE. Authflag is %d", auth_flag); + debug("Requesting NONE. Authflag is %d", auth_flag); if (auth_flag == 1) debug("None requested post authentication."); else fatal("Pre-authentication none cipher requests " "are not allowed."); - } + } #endif debug("kex: %s %s %s %s", ctos ? "client->server" : "server->client", |
