summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-29 21:41:03 +1000
committerDamien Miller <djm@mindrot.org>2011-05-29 21:41:03 +1000
commit201f425d298d3c1c43fac122e2e0bcbf7a707939 (patch)
treeb2fbd9916245e8defddc7474a66b5a64281a55c6
parent1dd66e5f748af2de4e0d83fa66d2f663ba62146d (diff)
- djm@cvs.openbsd.org 2011/05/23 03:52:55
[sshconnect.c] remove extra newline
-rw-r--r--ChangeLog3
-rw-r--r--sshconnect.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 04544286..75a88fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
- djm@cvs.openbsd.org 2011/05/23 03:33:38
[auth.c]
make secure_filename() spam debug logs less
+ - djm@cvs.openbsd.org 2011/05/23 03:52:55
+ [sshconnect.c]
+ remove extra newline
20110520
- (djm) [session.c] call setexeccon() before executing passwd for pw
diff --git a/sshconnect.c b/sshconnect.c
index 74643a8c..60344522 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.232 2011/01/16 11:50:36 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.233 2011/05/23 03:52:55 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1111,7 +1111,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key)
/* XXX certs are not yet supported for DNS */
if (!key_is_cert(host_key) && options.verify_host_key_dns &&
verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) {
-
if (flags & DNS_VERIFY_FOUND) {
if (options.verify_host_key_dns == 1 &&