diff options
author | Colin Watson <cjwatson@debian.org> | 2018-08-24 12:49:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:57:27 +0100 |
commit | 816386e17654ca36834bebbf351419e460fad8f6 (patch) | |
tree | 3dc79d831cb73bc25b92f5a4d18f8e328c0c570a /auth2-hostbased.c | |
parent | 3e6f76c7039d3df22b1d0a3a5f30150efb09b69d (diff) | |
parent | 16a47fc4b04977a14f44dd433c8da1499fa80671 (diff) |
New upstream release (7.8p1)
Closes: #907534
Diffstat (limited to 'auth2-hostbased.c')
-rw-r--r-- | auth2-hostbased.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c index 82a7dcdae..359393291 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-hostbased.c,v 1.33 2018/01/23 05:27:21 djm Exp $ */ | 1 | /* $OpenBSD: auth2-hostbased.c,v 1.36 2018/07/31 03:10:27 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -34,7 +34,7 @@ | |||
34 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
35 | #include "ssh2.h" | 35 | #include "ssh2.h" |
36 | #include "packet.h" | 36 | #include "packet.h" |
37 | #include "buffer.h" | 37 | #include "sshbuf.h" |
38 | #include "log.h" | 38 | #include "log.h" |
39 | #include "misc.h" | 39 | #include "misc.h" |
40 | #include "servconf.h" | 40 | #include "servconf.h" |
@@ -107,8 +107,7 @@ userauth_hostbased(struct ssh *ssh) | |||
107 | "signature format"); | 107 | "signature format"); |
108 | goto done; | 108 | goto done; |
109 | } | 109 | } |
110 | if (match_pattern_list(sshkey_ssh_name(key), | 110 | if (match_pattern_list(pkalg, options.hostbased_key_types, 0) != 1) { |
111 | options.hostbased_key_types, 0) != 1) { | ||
112 | logit("%s: key type %s not in HostbasedAcceptedKeyTypes", | 111 | logit("%s: key type %s not in HostbasedAcceptedKeyTypes", |
113 | __func__, sshkey_type(key)); | 112 | __func__, sshkey_type(key)); |
114 | goto done; | 113 | goto done; |