- (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@.

1 files changed, 4 insertions, 3 deletions

diff --git a/auth.c b/auth.c
index 976932887..a8cffd5c1 100644
--- a/auth.c
+++ b/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.
  *
@@ -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);