diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2015-05-01 04:17:52 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2015-05-01 04:17:52 +0000 |
| commit | 77590d389b86b42e18e5987404758cc8dbd655d3 (patch) | |
| tree | 30ec0d0f9229ed52bf990dbed08ea9b6a8c5aa13 | |
| parent | 46b255bb8fd78965ba5e6a46ae410518591bcdec (diff) | |
make handling of AuthorizedPrincipalsFile=none more consistent
with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/auth.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 3 |
2 files changed, 4 insertions, 4 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); } diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 68956c4d988..22311f20892 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.266 2015/04/29 03:48:56 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.267 2015/05/01 04:17:51 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -336,6 +336,7 @@ fill_default_server_options(ServerOptions *options) CLEAR_ON_NONE(options->banner); CLEAR_ON_NONE(options->trusted_user_ca_keys); CLEAR_ON_NONE(options->revoked_keys_file); + CLEAR_ON_NONE(options->authorized_principals_file); for (i = 0; i < options->num_host_key_files; i++) CLEAR_ON_NONE(options->host_key_files[i]); for (i = 0; i < options->num_host_cert_files; i++) |