upstream commit

make handling of AuthorizedPrincipalsFile=none more
 consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@

diff --git a/auth.c b/auth.c
index f9b76730194b84c34ff4c5b78ed011efebf2dec7..e6c094d1f16df9347880576d2ff4ef5995c461bd 100644 (file)
--- 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);
 }

diff --git a/servconf.c b/servconf.c
index c0291947bcfc05fcaa1d8de79e39013c5c1a6fb6..fadfa2757eedb79dbabceda31f03f5a4978635f7 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.269 2015/05/04 06:10:48 djm 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
@@ -352,6 +352,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++)