diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
commit | 8d6b7f4c46de3feb66f704ab483e51ea1a3bb0e1 (patch) | |
tree | 41fe3dd71501bbec5b0393f1536c925eaee180e9 /sshconnect.c | |
parent | f045c69060bfdd5cf8759a5f29d7008d02e4de5b (diff) | |
parent | 58bfa257481a1c6938ada9bbd38801cc45633fb0 (diff) |
Debian release 3.6p1-1.
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sshconnect.c b/sshconnect.c index 95e0f6d77..013a896b7 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.135 2002/09/19 01:58:18 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.137 2002/11/21 23:03:51 deraadt Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -254,7 +254,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
254 | */ | 254 | */ |
255 | int full_failure = 1; | 255 | int full_failure = 1; |
256 | 256 | ||
257 | debug("ssh_connect: needpriv %d", needpriv); | 257 | debug2("ssh_connect: needpriv %d", needpriv); |
258 | 258 | ||
259 | /* Get default port if port has not been set. */ | 259 | /* Get default port if port has not been set. */ |
260 | if (port == 0) { | 260 | if (port == 0) { |
@@ -681,10 +681,10 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
681 | "%s key fingerprint is %s.\n" | 681 | "%s key fingerprint is %s.\n" |
682 | "Are you sure you want to continue connecting " | 682 | "Are you sure you want to continue connecting " |
683 | "(yes/no)? ", | 683 | "(yes/no)? ", |
684 | host, ip, | 684 | host, ip, |
685 | has_keys ? ",\nbut keys of different type are already " | 685 | has_keys ? ",\nbut keys of different type are already " |
686 | "known for this host." : ".", | 686 | "known for this host." : ".", |
687 | type, fp); | 687 | type, fp); |
688 | xfree(fp); | 688 | xfree(fp); |
689 | if (!confirm(msg)) | 689 | if (!confirm(msg)) |
690 | goto fail; | 690 | goto fail; |