diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshconnect.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -13,6 +13,9 @@ | |||
13 | - djm@cvs.openbsd.org 2011/05/23 03:33:38 | 13 | - djm@cvs.openbsd.org 2011/05/23 03:33:38 |
14 | [auth.c] | 14 | [auth.c] |
15 | make secure_filename() spam debug logs less | 15 | make secure_filename() spam debug logs less |
16 | - djm@cvs.openbsd.org 2011/05/23 03:52:55 | ||
17 | [sshconnect.c] | ||
18 | remove extra newline | ||
16 | 19 | ||
17 | 20110520 | 20 | 20110520 |
18 | - (djm) [session.c] call setexeccon() before executing passwd for pw | 21 | - (djm) [session.c] call setexeccon() before executing passwd for pw |
diff --git a/sshconnect.c b/sshconnect.c index 74643a8c4..603445227 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.232 2011/01/16 11:50:36 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.233 2011/05/23 03:52:55 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 |
@@ -1111,7 +1111,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) | |||
1111 | /* XXX certs are not yet supported for DNS */ | 1111 | /* XXX certs are not yet supported for DNS */ |
1112 | if (!key_is_cert(host_key) && options.verify_host_key_dns && | 1112 | if (!key_is_cert(host_key) && options.verify_host_key_dns && |
1113 | verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) { | 1113 | verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) { |
1114 | |||
1115 | if (flags & DNS_VERIFY_FOUND) { | 1114 | if (flags & DNS_VERIFY_FOUND) { |
1116 | 1115 | ||
1117 | if (options.verify_host_key_dns == 1 && | 1116 | if (options.verify_host_key_dns == 1 && |