diff options
author | Damien Miller <djm@mindrot.org> | 2012-04-22 11:21:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-04-22 11:21:43 +1000 |
commit | 9fed161e67b23977a1070419b356084295422f0c (patch) | |
tree | 0fd54cc7e3aa515a18c69886c12c054915b084cc /auth.c | |
parent | a6508753db3c49910068d8fc324bd284d72ff153 (diff) |
- djm@cvs.openbsd.org 2012/04/11 13:17:54
[auth.c]
Support "none" as an argument for AuthorizedPrincipalsFile to indicate
no file should be read.
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.95 2012/04/11 13:17:54 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -357,7 +357,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
357 | char * | 357 | char * |
358 | authorized_principals_file(struct passwd *pw) | 358 | authorized_principals_file(struct passwd *pw) |
359 | { | 359 | { |
360 | if (options.authorized_principals_file == NULL) | 360 | if (options.authorized_principals_file == NULL || |
361 | strcasecmp(options.authorized_principals_file, "none") == 0) | ||
361 | return NULL; | 362 | return NULL; |
362 | return expand_authorized_keys(options.authorized_principals_file, pw); | 363 | return expand_authorized_keys(options.authorized_principals_file, pw); |
363 | } | 364 | } |