diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-08-26 09:25:17 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-08-26 09:25:17 +0000 |
| commit | d994eeedda788efc28b630e10a33548453293473 (patch) | |
| tree | 17adf9bed3cc39b4f8db3c235622326d1cdcc34f /auth.c | |
| parent | b5a1b3a82df411cb95b6a850e9d9d90bc3d082f9 (diff) | |
| download | src-d994eeedda788efc28b630e10a33548453293473.tar.gz src-d994eeedda788efc28b630e10a33548453293473.zip | |
Vendor import of OpenSSH 7.0p1vendor/openssh/7.0p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=287156
svn path=/vendor-crypto/openssh/7.0p1/; revision=287157; tag=vendor/openssh/7.0p1
Diffstat (limited to 'auth.c')
| -rw-r--r-- | auth.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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. * @@ -352,7 +352,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: |