- dtucker@cvs.openbsd.org 2006/07/12 11:34:58

     [sshd.c servconf.h servconf.c sshd_config.5 auth.c]
     Add support for conditional directives to sshd_config via a "Match"
     keyword, which works similarly to the "Host" directive in ssh_config.
     Lines after a Match line override the default set in the main section
     if the condition on the Match line is true, eg
     AllowTcpForwarding yes
     Match User anoncvs
             AllowTcpForwarding no
     will allow port forwarding by all users except "anoncvs".
     Currently only a very small subset of directives are supported.
     ok djm@

1 files changed, 4 insertions, 1 deletions

diff --git a/auth.c b/auth.c
index e5ddc79da..3bca8dc21 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.70 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: auth.c,v 1.71 2006/07/12 11:34:58 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -467,6 +467,9 @@ getpwnamallow(const char *user)
 #endif
         struct passwd *pw;
 
+        parse_server_match_config(&options, user,
+            get_canonical_hostname(options.use_dns), get_remote_ipaddr());
+
         pw = getpwnam(user);
         if (pw == NULL) {
                 logit("Invalid user %.100s from %.100s",