diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:55:54 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:55:54 +0000 |
| commit | 925f1fb7e466dbf645650dc4ea9d2a34e728ef9c (patch) | |
| tree | 0fb8acbff73fddb3a95e864c5ddd6370367153a9 /auth.c | |
| parent | 2e97a36905ba9936cb9972e37c5e56deb288e442 (diff) | |
| download | src-925f1fb7e466dbf645650dc4ea9d2a34e728ef9c.tar.gz src-925f1fb7e466dbf645650dc4ea9d2a34e728ef9c.zip | |
Vendor import of OpenSSH 6.1p1.vendor/openssh/6.1p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=239849
svn path=/vendor-crypto/openssh/6.1p1/; revision=239851; tag=vendor/openssh/6.1p1
Diffstat (limited to 'auth.c')
| -rw-r--r-- | auth.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.96 2012/05/13 01:42:32 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -357,7 +357,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) char * 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 expand_authorized_keys(options.authorized_principals_file, pw); } @@ -544,9 +545,10 @@ getpwnamallow(const char *user) #endif #endif struct passwd *pw; + struct connection_info *ci = get_connection_info(1, options.use_dns); - parse_server_match_config(&options, user, - get_canonical_hostname(options.use_dns), get_remote_ipaddr()); + ci->user = user; + parse_server_match_config(&options, ci); #if defined(_AIX) && defined(HAVE_SETAUTHDB) aix_setauthdb(user); |