summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:47:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:47:23 +0000
commit6df8ef4196f1287d4c328f09ea7f8c0995e0cab1 (patch)
treec4d4da3f9a84099838388a6070c7cdc675c27155 /sshconnect.c
parentfafea18d68f3d1a4ea412ff4618fd66c1a05b548 (diff)
- millert@cvs.openbsd.org 2001/03/04 17:42:28
[authfd.c channels.c dh.c log.c readconf.c servconf.c sftp-int.c ssh.c sshconnect.c sshd.c] log functions should not be passed strings that end in newline as they get passed on to syslog() and when logging to stderr, do_log() appends its own newline.
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 623caed73..9962d49bd 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.97 2001/02/15 23:19:59 markus Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.98 2001/03/04 17:42:28 millert Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -618,7 +618,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
618 "Are you sure you want to continue connecting (yes/no)? ", 618 "Are you sure you want to continue connecting (yes/no)? ",
619 host, ip, type, key_fingerprint(host_key)); 619 host, ip, type, key_fingerprint(host_key));
620 if (!read_yes_or_no(prompt, -1)) 620 if (!read_yes_or_no(prompt, -1))
621 fatal("Aborted by user!\n"); 621 fatal("Aborted by user!");
622 } 622 }
623 if (options.check_host_ip && ip_status == HOST_NEW) { 623 if (options.check_host_ip && ip_status == HOST_NEW) {
624 snprintf(hostline, sizeof(hostline), "%s,%s", host, ip); 624 snprintf(hostline, sizeof(hostline), "%s,%s", host, ip);
@@ -719,7 +719,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
719 } else if (options.strict_host_key_checking == 2) { 719 } else if (options.strict_host_key_checking == 2) {
720 if (!read_yes_or_no("Are you sure you want " \ 720 if (!read_yes_or_no("Are you sure you want " \
721 "to continue connecting (yes/no)? ", -1)) 721 "to continue connecting (yes/no)? ", -1))
722 fatal("Aborted by user!\n"); 722 fatal("Aborted by user!");
723 } 723 }
724 } 724 }
725 725