diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2012-05-13 01:42:33 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2012-05-13 01:42:33 +0000 |
| commit | 23f5a4eccb89e285c41dbb45d15e63ccd7a0e7a0 (patch) | |
| tree | 2fb29573a4b42239d7dcc5076c5e0765166878da /usr.bin/ssh/auth.c | |
| parent | d4519c494c7974b50ea27f225264140734385a4b (diff) | |
Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
to match. Feedback and ok djm@ markus@.
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index a3920fab111..01c6a5dcf12 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.95 2012/04/11 13:17:54 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.96 2012/05/13 01:42:32 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -451,9 +451,10 @@ getpwnamallow(const char *user) extern login_cap_t *lc; auth_session_t *as; 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); pw = getpwnam(user); if (pw == NULL) { |