diff options
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.96 2012/05/13 01:42:32 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -357,7 +357,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
357 | char * | 357 | char * |
358 | authorized_principals_file(struct passwd *pw) | 358 | authorized_principals_file(struct passwd *pw) |
359 | { | 359 | { |
360 | if (options.authorized_principals_file == NULL) | 360 | if (options.authorized_principals_file == NULL || |
361 | strcasecmp(options.authorized_principals_file, "none") == 0) | ||
361 | return NULL; | 362 | return NULL; |
362 | return expand_authorized_keys(options.authorized_principals_file, pw); | 363 | return expand_authorized_keys(options.authorized_principals_file, pw); |
363 | } | 364 | } |
@@ -544,9 +545,10 @@ getpwnamallow(const char *user) | |||
544 | #endif | 545 | #endif |
545 | #endif | 546 | #endif |
546 | struct passwd *pw; | 547 | struct passwd *pw; |
548 | struct connection_info *ci = get_connection_info(1, options.use_dns); | ||
547 | 549 | ||
548 | parse_server_match_config(&options, user, | 550 | ci->user = user; |
549 | get_canonical_hostname(options.use_dns), get_remote_ipaddr()); | 551 | parse_server_match_config(&options, ci); |
550 | 552 | ||
551 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) | 553 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) |
552 | aix_setauthdb(user); | 554 | aix_setauthdb(user); |