diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 19:37:01 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 19:37:01 +1000 |
commit | fbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74 (patch) | |
tree | f13d5eac3813d70d50c50196716981b79c606063 /auth.c | |
parent | 593538911a4d27f11f8d56e32abe141223c25916 (diff) |
- (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 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.95 2012/04/11 13:17:54 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 | * |
@@ -545,9 +545,10 @@ getpwnamallow(const char *user) | |||
545 | #endif | 545 | #endif |
546 | #endif | 546 | #endif |
547 | struct passwd *pw; | 547 | struct passwd *pw; |
548 | struct connection_info *ci = get_connection_info(1, options.use_dns); | ||
548 | 549 | ||
549 | parse_server_match_config(&options, user, | 550 | ci->user = user; |
550 | get_canonical_hostname(options.use_dns), get_remote_ipaddr()); | 551 | parse_server_match_config(&options, ci); |
551 | 552 | ||
552 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) | 553 | #if defined(_AIX) && defined(HAVE_SETAUTHDB) |
553 | aix_setauthdb(user); | 554 | aix_setauthdb(user); |