diff options
| author |   djm <djm@openbsd.org> | 2015-05-01 04:17:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-05-01 04:17:51 +0000 |
| commit | 7a5ec2392c50f99cee78ac915c51dd61a5b83be1 (patch) | |
| tree | a153c5e45acdfce2e8358e1c8c5fcbfe2033fd80 /usr.bin/ssh/auth.c | |
| parent | remove failed remote forwards established by muliplexing from the (diff) | |
| download | wireguard-openbsd-7a5ec2392c50f99cee78ac915c51dd61a5b83be1.tar.xz wireguard-openbsd-7a5ec2392c50f99cee78ac915c51dd61a5b83be1.zip | |
make handling of AuthorizedPrincipalsFile=none more consistent
with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index 6eea5386946..cd5abbbc6a6 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/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. * @@ -309,8 +309,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); } |