diff options
| author | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
| commit | 00f3582ac62b9883e85e2cb420c3d9f5d9028188 (patch) | |
| tree | eafe8a40bcffb53c6bb88d75ac823cdc99ac92fe /crypto/openssh/auth.c | |
| parent | d00fafff0e6a902c30e2a606c69d740558908f1d (diff) | |
| download | FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.zip FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.tar.gz | |
Upgrade OpenSSH to 6.1p1.
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index 893dc7b..7fb1068 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -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. * @@ -358,7 +358,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); } @@ -545,9 +546,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); |
