- OpenBSD CVS update

[openssh.git] / readconf.c

diff --git a/readconf.c b/readconf.c
index fdbd1e7d91db0129b75f21ec70c22441a89eb327..d30641ed17d0ab70541adb2724f36b9daeb05221 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -475,7 +475,7 @@ parse_int:
        case oCiphers:
                cp = strtok(NULL, WHITESPACE);
                if (!ciphers_valid(cp))
-                       fatal("%.200s line %d: Bad cipher spec '%s'.",
+                       fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
                              filename, linenum, cp ? cp : "<NONE>");
                if (*activep && options->ciphers == NULL)
                        options->ciphers = xstrdup(cp);
@@ -745,6 +745,7 @@ fill_default_options(Options * options)
        /* Selected in ssh_login(). */
        if (options->cipher == -1)
                options->cipher = SSH_CIPHER_NOT_SET;
+       /* options->ciphers, default set in myproposals.h */
        if (options->protocol == SSH_PROTO_UNKNOWN)
                options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
        if (options->num_identity_files == 0) {