summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sshconnect.c b/sshconnect.c
index dae25969a..b0ba3f0c6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -332,7 +332,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
332 332
333 /* Return failure if we didn't get a successful connection. */ 333 /* Return failure if we didn't get a successful connection. */
334 if (attempt >= connection_attempts) { 334 if (attempt >= connection_attempts) {
335 log("ssh: connect to host %s port %s: %s", 335 logit("ssh: connect to host %s port %s: %s",
336 host, strport, strerror(errno)); 336 host, strport, strerror(errno));
337 return full_failure ? ECONNABORTED : ECONNREFUSED; 337 return full_failure ? ECONNABORTED : ECONNREFUSED;
338 } 338 }
@@ -421,7 +421,7 @@ ssh_exchange_identification(void)
421 enable_compat13(); 421 enable_compat13();
422 minor1 = 3; 422 minor1 = 3;
423 if (options.forward_agent) { 423 if (options.forward_agent) {
424 log("Agent forwarding disabled for protocol 1.3"); 424 logit("Agent forwarding disabled for protocol 1.3");
425 options.forward_agent = 0; 425 options.forward_agent = 0;
426 } 426 }
427 } 427 }
@@ -612,16 +612,16 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
612 debug("Found key in %s:%d", host_file, host_line); 612 debug("Found key in %s:%d", host_file, host_line);
613 if (options.check_host_ip && ip_status == HOST_NEW) { 613 if (options.check_host_ip && ip_status == HOST_NEW) {
614 if (readonly) 614 if (readonly)
615 log("%s host key for IP address " 615 logit("%s host key for IP address "
616 "'%.128s' not in list of known hosts.", 616 "'%.128s' not in list of known hosts.",
617 type, ip); 617 type, ip);
618 else if (!add_host_to_hostfile(user_hostfile, ip, 618 else if (!add_host_to_hostfile(user_hostfile, ip,
619 host_key)) 619 host_key))
620 log("Failed to add the %s host key for IP " 620 logit("Failed to add the %s host key for IP "
621 "address '%.128s' to the list of known " 621 "address '%.128s' to the list of known "
622 "hosts (%.30s).", type, ip, user_hostfile); 622 "hosts (%.30s).", type, ip, user_hostfile);
623 else 623 else
624 log("Warning: Permanently added the %s host " 624 logit("Warning: Permanently added the %s host "
625 "key for IP address '%.128s' to the list " 625 "key for IP address '%.128s' to the list "
626 "of known hosts.", type, ip); 626 "of known hosts.", type, ip);
627 } 627 }
@@ -668,10 +668,10 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
668 * local known_hosts file. 668 * local known_hosts file.
669 */ 669 */
670 if (!add_host_to_hostfile(user_hostfile, hostp, host_key)) 670 if (!add_host_to_hostfile(user_hostfile, hostp, host_key))
671 log("Failed to add the host to the list of known " 671 logit("Failed to add the host to the list of known "
672 "hosts (%.500s).", user_hostfile); 672 "hosts (%.500s).", user_hostfile);
673 else 673 else
674 log("Warning: Permanently added '%.200s' (%s) to the " 674 logit("Warning: Permanently added '%.200s' (%s) to the "
675 "list of known hosts.", hostp, type); 675 "list of known hosts.", hostp, type);
676 break; 676 break;
677 case HOST_CHANGED: 677 case HOST_CHANGED:
@@ -774,7 +774,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
774 host_file, host_line); 774 host_file, host_line);
775 } 775 }
776 if (options.strict_host_key_checking == 1) { 776 if (options.strict_host_key_checking == 1) {
777 log(msg); 777 logit(msg);
778 error("Exiting, you have requested strict checking."); 778 error("Exiting, you have requested strict checking.");
779 goto fail; 779 goto fail;
780 } else if (options.strict_host_key_checking == 2) { 780 } else if (options.strict_host_key_checking == 2) {
@@ -783,7 +783,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
783 if (!confirm(msg)) 783 if (!confirm(msg))
784 goto fail; 784 goto fail;
785 } else { 785 } else {
786 log(msg); 786 logit(msg);
787 } 787 }
788 } 788 }
789 789
@@ -881,7 +881,7 @@ show_key_from_file(const char *file, const char *host, int keytype)
881 if ((ret = lookup_key_in_hostfile_by_type(file, host, 881 if ((ret = lookup_key_in_hostfile_by_type(file, host,
882 keytype, found, &line))) { 882 keytype, found, &line))) {
883 fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); 883 fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
884 log("WARNING: %s key found for host %s\n" 884 logit("WARNING: %s key found for host %s\n"
885 "in %s:%d\n" 885 "in %s:%d\n"
886 "%s key fingerprint %s.", 886 "%s key fingerprint %s.",
887 key_type(found), host, file, line, 887 key_type(found), host, file, line,