diff options
| author | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
| commit | 9b2207f86007504b58fbb42ce7f30946bbd50cea (patch) | |
| tree | c90d6531b4082060e49583793ca124b381f7ffd6 /crypto/openssh/auth.c | |
| parent | e86fa364ca07e2714edcfb3790ae4ea2b1d460c9 (diff) | |
| download | FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.zip FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.tar.gz | |
Upgrade to OpenSSH 7.0p1.
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index 5f72416..7dd8eb6 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.112 2015/08/06 14:53:21 deraadt Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -353,7 +353,9 @@ auth_root_allowed(const char *method) case PERMIT_YES: return 1; case PERMIT_NO_PASSWD: - if (strcmp(method, "password") != 0) + if (strcmp(method, "publickey") == 0 || + strcmp(method, "hostbased") == 0 || + strcmp(method, "gssapi-with-mic")) return 1; break; case PERMIT_FORCED_ONLY: |
