tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

whitespace at EOL

OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6
This commit is contained in:
djm@openbsd.org@openbsd.org 2017-10-27 01:57:06 +00:00 committed by Damien Miller
parent d213547434
commit dbe0662e9c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.467 2017/10/25 00:21:37 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.468 2017/10/27 01:57:06 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1023,9 +1023,9 @@ main(int ac, char **av)
if (logfile != NULL) if (logfile != NULL)
log_redirect_stderr_to(logfile); log_redirect_stderr_to(logfile);
log_init(argv0, log_init(argv0,
options.log_level == SYSLOG_LEVEL_NOT_SET ? options.log_level == SYSLOG_LEVEL_NOT_SET ?
SYSLOG_LEVEL_INFO : options.log_level, SYSLOG_LEVEL_INFO : options.log_level,
options.log_facility == SYSLOG_FACILITY_NOT_SET ? options.log_facility == SYSLOG_FACILITY_NOT_SET ?
SYSLOG_FACILITY_USER : options.log_facility, SYSLOG_FACILITY_USER : options.log_facility,
!use_syslog); !use_syslog);
@ -1064,7 +1064,7 @@ main(int ac, char **av)
* If CanonicalizePermittedCNAMEs have been specified but * If CanonicalizePermittedCNAMEs have been specified but
* other canonicalization did not happen (by not being requested * other canonicalization did not happen (by not being requested
* or by failing with fallback) then the hostname may still be changed * or by failing with fallback) then the hostname may still be changed
* as a result of CNAME following. * as a result of CNAME following.
* *
* Try to resolve the bare hostname name using the system resolver's * Try to resolve the bare hostname name using the system resolver's
* usual search rules and then apply the CNAME follow rules. * 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)
channel_update_permitted_opens(ssh, rfwd->handle, -1); channel_update_permitted_opens(ssh, rfwd->handle, -1);
} }
} }
if (type == SSH2_MSG_REQUEST_FAILURE) { if (type == SSH2_MSG_REQUEST_FAILURE) {
if (options.exit_on_forward_failure) { if (options.exit_on_forward_failure) {
if (rfwd->listen_path != NULL) if (rfwd->listen_path != NULL)
@ -1706,7 +1706,7 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname)
else else
error("Could not request tunnel forwarding."); error("Could not request tunnel forwarding.");
} }
} }
} }
static void static void