diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-05-01 04:17:51 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-05-10 11:54:56 +1000 |
commit | 7e8528cad04b2775c3b7db08abf8fb42e47e6b2a (patch) | |
tree | d8aead0c28c8b0a71c47e2ee5804d085d34bb435 /auth.c | |
parent | ca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7 (diff) |
upstream commit
make handling of AuthorizedPrincipalsFile=none more
consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.110 2015/02/25 17:29:38 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -400,8 +400,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
400 | char * | 400 | char * |
401 | authorized_principals_file(struct passwd *pw) | 401 | authorized_principals_file(struct passwd *pw) |
402 | { | 402 | { |
403 | if (options.authorized_principals_file == NULL || | 403 | if (options.authorized_principals_file == NULL) |
404 | strcasecmp(options.authorized_principals_file, "none") == 0) | ||
405 | return NULL; | 404 | return NULL; |
406 | return expand_authorized_keys(options.authorized_principals_file, pw); | 405 | return expand_authorized_keys(options.authorized_principals_file, pw); |
407 | } | 406 | } |