1 files changed, 11 insertions, 3 deletions

diff --git a/auth.c b/auth.c
index 892bb261a..84e0be761 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.25 2001/06/25 17:54:48 provos Exp $");
+RCSID("$OpenBSD: auth.c,v 1.26 2001/06/27 04:48:52 markus Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -65,6 +65,7 @@ int
 allowed_user(struct passwd * pw)
 {
         struct stat st;
+        const char *hostname = NULL, *ipaddr = NULL;
         char *shell;
         int i;
 #ifdef WITH_AIXAUTHENTICATE
@@ -109,16 +110,23 @@ allowed_user(struct passwd * pw)
         if (!((st.st_mode & S_IFREG) && (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP))))
                 return 0;
 
+        if (options.num_deny_users > 0 || options.num_allow_users > 0) {
+                hostname = get_canonical_hostname(options.reverse_mapping_check);
+                ipaddr = get_remote_ipaddr();
+        }
+
         /* Return false if user is listed in DenyUsers */
         if (options.num_deny_users > 0) {
                 for (i = 0; i < options.num_deny_users; i++)
-                        if (match_pattern(pw->pw_name, options.deny_users[i]))
+                        if (match_user(pw->pw_name, hostname, ipaddr,
+                            options.deny_users[i]))
                                 return 0;
         }
         /* Return false if AllowUsers isn't empty and user isn't listed there */
         if (options.num_allow_users > 0) {
                 for (i = 0; i < options.num_allow_users; i++)
-                        if (match_pattern(pw->pw_name, options.allow_users[i]))
+                        if (match_user(pw->pw_name, hostname, ipaddr,
+                            options.allow_users[i]))
                                 break;
                 /* i < options.num_allow_users iff we break for loop */
                 if (i >= options.num_allow_users)