diff options
author | Damien Miller <djm@mindrot.org> | 2010-08-05 13:04:50 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-08-05 13:04:50 +1000 |
commit | c158331f8c7e059c6c1d099bffc7f5fc6087ddbd (patch) | |
tree | f1998f0fb52e5fb666ee67064a424af45e941f6b /auth.c | |
parent | 1da638895916bc061ff6aca9f373d48a9776810b (diff) |
- djm@cvs.openbsd.org 2010/08/04 05:42:47
[auth.c auth2-hostbased.c authfile.c authfile.h ssh-keysign.8]
[ssh-keysign.c ssh.c]
enable certificates for hostbased authentication, from Iain Morgan;
"looks ok" markus@
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.88 2010/06/22 04:49:47 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.89 2010/08/04 05:42:47 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -385,7 +385,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host, | |||
385 | HostStatus host_status; | 385 | HostStatus host_status; |
386 | 386 | ||
387 | /* Check if we know the host and its host key. */ | 387 | /* Check if we know the host and its host key. */ |
388 | found = key_new(key->type); | 388 | found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type); |
389 | host_status = check_host_in_hostfile(sysfile, host, key, found, NULL); | 389 | host_status = check_host_in_hostfile(sysfile, host, key, found, NULL); |
390 | 390 | ||
391 | if (host_status != HOST_OK && userfile != NULL) { | 391 | if (host_status != HOST_OK && userfile != NULL) { |