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 | * |
@@ -358,7 +358,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
358 | char * | 358 | char * |
359 | authorized_principals_file(struct passwd *pw) | 359 | authorized_principals_file(struct passwd *pw) |
360 | { | 360 | { |
361 | if (options.authorized_principals_file == NULL) | 361 | if (options.authorized_principals_file == NULL || |
362 | strcasecmp(options.authorized_principals_file, "none") == 0) | ||
362 | return NULL; | 363 | return NULL; |
363 | return expand_authorized_keys(options.authorized_principals_file, pw); | 364 | return expand_authorized_keys(options.authorized_principals_file, pw); |
364 | } | 365 | } |
@@ -542,9 +543,10 @@ getpwnamallow(const char *user) | |||
542 | #endif | 543 | #endif |
543 | #endif | 544 | #endif |
544 | struct passwd *pw; | 545 | struct passwd *pw; |
546 | struct connection_info *ci = get_connection_info(1, options.use_dns); | ||
545 | 547 | ||
546 | parse_server_match_config(&options, user, | 548 | ci->user = user; |
547 | get_canonical_hostname(options.use_dns), get_remote_ipaddr()); | 549 | parse_server_match_config(&options, ci); |
548 | 550 | ||
549 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) | 551 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) |
550 | aix_setauthdb(user); | 552 | aix_setauthdb(user); |