diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-04-11 13:17:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-04-11 13:17:55 +0000 |
| commit | 8b069df63d5890aa4c09cababd813a3f73b72186 (patch) | |
| tree | 9d1d070fcfe97c870e9dbdcad3cfd9fd821f7e00 /usr.bin/ssh | |
| parent | 6225368f4c57f651ef21e200af3390ee7e093ca1 (diff) | |
Support "none" as an argument for AuthorizedPrincipalsFile to indicate
no file should be read.
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/auth.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index d3663a487ce..a3920fab111 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.95 2012/04/11 13:17:54 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -267,7 +267,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) char * authorized_principals_file(struct passwd *pw) { - if (options.authorized_principals_file == NULL) + if (options.authorized_principals_file == NULL || + strcasecmp(options.authorized_principals_file, "none") == 0) return NULL; return expand_authorized_keys(options.authorized_principals_file, pw); } |