tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

make handling of AuthorizedPrincipalsFile=none more
 consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
This commit is contained in:
djm@openbsd.org 2015-05-01 04:17:51 +00:00 committed by Damien Miller
parent ca430d4d9c
commit 7e8528cad0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth.c
View File

@ -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. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -400,8 +400,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw)
char * char *
authorized_principals_file(struct passwd *pw) 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 NULL;
return expand_authorized_keys(options.authorized_principals_file, pw); return expand_authorized_keys(options.authorized_principals_file, pw);
} }

3
servconf.c
View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -352,6 +352,7 @@ fill_default_server_options(ServerOptions *options)
CLEAR_ON_NONE(options->banner); CLEAR_ON_NONE(options->banner);
CLEAR_ON_NONE(options->trusted_user_ca_keys); CLEAR_ON_NONE(options->trusted_user_ca_keys);
CLEAR_ON_NONE(options->revoked_keys_file); CLEAR_ON_NONE(options->revoked_keys_file);
CLEAR_ON_NONE(options->authorized_principals_file);
for (i = 0; i < options->num_host_key_files; i++) for (i = 0; i < options->num_host_key_files; i++)
CLEAR_ON_NONE(options->host_key_files[i]); CLEAR_ON_NONE(options->host_key_files[i]);
for (i = 0; i < options->num_host_cert_files; i++) for (i = 0; i < options->num_host_cert_files; i++)