summaryrefslogtreecommitdiffstats
path: root/auth.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-05-01 04:17:51 +0000
committerDamien Miller <djm@mindrot.org>2015-05-10 11:54:56 +1000
commit7e8528cad04b2775c3b7db08abf8fb42e47e6b2a (patch)
treed8aead0c28c8b0a71c47e2ee5804d085d34bb435 /auth.c
parentca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7 (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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/auth.c b/auth.c
index f9b76730..e6c094d1 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.110 2015/02/25 17:29:38 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -400,8 +400,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw)
char *
authorized_principals_file(struct passwd *pw)
{
- if (options.authorized_principals_file == NULL ||
- strcasecmp(options.authorized_principals_file, "none") == 0)
+ if (options.authorized_principals_file == NULL)
return NULL;
return expand_authorized_keys(options.authorized_principals_file, pw);
}