diff options
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.112 2015/08/06 14:53:21 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -352,7 +352,9 @@ auth_root_allowed(const char *method) | |||
352 | case PERMIT_YES: | 352 | case PERMIT_YES: |
353 | return 1; | 353 | return 1; |
354 | case PERMIT_NO_PASSWD: | 354 | case PERMIT_NO_PASSWD: |
355 | if (strcmp(method, "password") != 0) | 355 | if (strcmp(method, "publickey") == 0 || |
356 | strcmp(method, "hostbased") == 0 || | ||
357 | strcmp(method, "gssapi-with-mic")) | ||
356 | return 1; | 358 | return 1; |
357 | break; | 359 | break; |
358 | case PERMIT_FORCED_ONLY: | 360 | case PERMIT_FORCED_ONLY: |