diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 11:37:01 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 11:37:01 +0200 |
| commit | fbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74 (patch) | |
| tree | f13d5eac3813d70d50c50196716981b79c606063 /auth.c | |
| parent | - (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find (diff) | |
| download | openssh-fbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74.tar.xz openssh-fbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74.zip | |
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2012/05/13 01:42:32
[servconf.h servconf.c sshd.8 sshd.c auth.c sshd_config.5]
Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
to match. Feedback and ok djm@ markus@.
Diffstat (limited to 'auth.c')
| -rw-r--r-- | auth.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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. * @@ -545,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); |