diff options
author | Colin Watson <cjwatson@debian.org> | 2004-01-04 18:19:55 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-01-04 18:19:55 +0000 |
commit | 08729bd7a1d84b3069b595606d0ff2ad9f7f19de (patch) | |
tree | 692ad3dc8566ca71c19c95324d819b9bc8ce1bc7 | |
parent | f53b418b143b195b76f7c6d6c9047925775f1976 (diff) |
Backport format string bug fix in sshconnect.c (closes: #225238).
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | sshconnect.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 67e4d81f2..ff1092690 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -3,6 +3,7 @@ openssh (1:3.6.1p2-11) UNRELEASED; urgency=low | |||
3 | * Comment out pam_limits in default configuration, for now at least | 3 | * Comment out pam_limits in default configuration, for now at least |
4 | (closes: #198254). | 4 | (closes: #198254). |
5 | * Use invoke-rc.d (if it exists) to run the init script. | 5 | * Use invoke-rc.d (if it exists) to run the init script. |
6 | * Backport format string bug fix in sshconnect.c (closes: #225238). | ||
6 | 7 | ||
7 | -- Colin Watson <cjwatson@debian.org> Tue, 30 Dec 2003 13:38:02 +0000 | 8 | -- Colin Watson <cjwatson@debian.org> Tue, 30 Dec 2003 13:38:02 +0000 |
8 | 9 | ||
diff --git a/sshconnect.c b/sshconnect.c index 013a896b7..0423955f7 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -806,7 +806,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
806 | host_file, host_line); | 806 | host_file, host_line); |
807 | } | 807 | } |
808 | if (options.strict_host_key_checking == 1) { | 808 | if (options.strict_host_key_checking == 1) { |
809 | log(msg); | 809 | log("%s", msg); |
810 | error("Exiting, you have requested strict checking."); | 810 | error("Exiting, you have requested strict checking."); |
811 | goto fail; | 811 | goto fail; |
812 | } else if (options.strict_host_key_checking == 2) { | 812 | } else if (options.strict_host_key_checking == 2) { |
@@ -815,7 +815,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
815 | if (!confirm(msg)) | 815 | if (!confirm(msg)) |
816 | goto fail; | 816 | goto fail; |
817 | } else { | 817 | } else { |
818 | log(msg); | 818 | log("%s", msg); |
819 | } | 819 | } |
820 | } | 820 | } |
821 | 821 | ||