diff options
-rw-r--r-- | ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.467 2017/10/25 00:21:37 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.468 2017/10/27 01:57:06 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1023,9 +1023,9 @@ main(int ac, char **av) | |||
1023 | if (logfile != NULL) | 1023 | if (logfile != NULL) |
1024 | log_redirect_stderr_to(logfile); | 1024 | log_redirect_stderr_to(logfile); |
1025 | log_init(argv0, | 1025 | log_init(argv0, |
1026 | options.log_level == SYSLOG_LEVEL_NOT_SET ? | 1026 | options.log_level == SYSLOG_LEVEL_NOT_SET ? |
1027 | SYSLOG_LEVEL_INFO : options.log_level, | 1027 | SYSLOG_LEVEL_INFO : options.log_level, |
1028 | options.log_facility == SYSLOG_FACILITY_NOT_SET ? | 1028 | options.log_facility == SYSLOG_FACILITY_NOT_SET ? |
1029 | SYSLOG_FACILITY_USER : options.log_facility, | 1029 | SYSLOG_FACILITY_USER : options.log_facility, |
1030 | !use_syslog); | 1030 | !use_syslog); |
1031 | 1031 | ||
@@ -1064,7 +1064,7 @@ main(int ac, char **av) | |||
1064 | * If CanonicalizePermittedCNAMEs have been specified but | 1064 | * If CanonicalizePermittedCNAMEs have been specified but |
1065 | * other canonicalization did not happen (by not being requested | 1065 | * other canonicalization did not happen (by not being requested |
1066 | * or by failing with fallback) then the hostname may still be changed | 1066 | * or by failing with fallback) then the hostname may still be changed |
1067 | * as a result of CNAME following. | 1067 | * as a result of CNAME following. |
1068 | * | 1068 | * |
1069 | * Try to resolve the bare hostname name using the system resolver's | 1069 | * Try to resolve the bare hostname name using the system resolver's |
1070 | * usual search rules and then apply the CNAME follow rules. | 1070 | * usual search rules and then apply the CNAME follow rules. |
@@ -1578,7 +1578,7 @@ ssh_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt) | |||
1578 | channel_update_permitted_opens(ssh, rfwd->handle, -1); | 1578 | channel_update_permitted_opens(ssh, rfwd->handle, -1); |
1579 | } | 1579 | } |
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | if (type == SSH2_MSG_REQUEST_FAILURE) { | 1582 | if (type == SSH2_MSG_REQUEST_FAILURE) { |
1583 | if (options.exit_on_forward_failure) { | 1583 | if (options.exit_on_forward_failure) { |
1584 | if (rfwd->listen_path != NULL) | 1584 | if (rfwd->listen_path != NULL) |
@@ -1706,7 +1706,7 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname) | |||
1706 | else | 1706 | else |
1707 | error("Could not request tunnel forwarding."); | 1707 | error("Could not request tunnel forwarding."); |
1708 | } | 1708 | } |
1709 | } | 1709 | } |
1710 | } | 1710 | } |
1711 | 1711 | ||
1712 | static void | 1712 | static void |