summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>2017-10-27 01:57:06 +0000
committerDamien Miller <djm@mindrot.org>2017-10-31 09:08:51 +1100
commitdbe0662e9cd482593a4a8bf58c6481bfe8a747a4 (patch)
tree203f2798a27be6113622ebb00fc9bd3c88d7b485
parentd2135474344335a7c6ee643b6ade6db400fa76ee (diff)
upstream commit
whitespace at EOL OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6
-rw-r--r--ssh.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh.c b/ssh.c
index ae468d28..9d5d9525 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1023,9 +1023,9 @@ main(int ac, char **av)
if (logfile != NULL)
log_redirect_stderr_to(logfile);
log_init(argv0,
- options.log_level == SYSLOG_LEVEL_NOT_SET ?
+ options.log_level == SYSLOG_LEVEL_NOT_SET ?
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,
!use_syslog);
@@ -1064,7 +1064,7 @@ main(int ac, char **av)
* If CanonicalizePermittedCNAMEs have been specified but
* other canonicalization did not happen (by not being requested
* 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
* 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);
}
}
-
+
if (type == SSH2_MSG_REQUEST_FAILURE) {
if (options.exit_on_forward_failure) {
if (rfwd->listen_path != NULL)
@@ -1706,7 +1706,7 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname)
else
error("Could not request tunnel forwarding.");
}
- }
+ }
}
static void