- djm@cvs.openbsd.org 2005/06/17 02:44:33

[openssh.git] / match.c

diff --git a/match.c b/match.c
index e73ed2aa2e81617d8fdfc468b3ff40384f035be8..29fb7dab94e252bf0d4e61e7254b46bde41d84dd 100644 (file)
--- a/match.c
+++ b/match.c
@@ -35,10 +35,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: match.c,v 1.18 2002/02/28 19:36:28 stevesk Exp $");
+RCSID("$OpenBSD: match.c,v 1.20 2005/06/17 02:44:32 djm Exp $");
 
 #include "match.h"
-#include "canohost.h"
 #include "xmalloc.h"
 
 /*
@@ -203,7 +202,7 @@ match_host_and_ip(const char *host, const char *ipaddr,
  * match user, user@host_or_ip, user@host_or_ip_list against pattern
  */
 int
-match_user(const char *user, int verify_reverse_mapping,
+match_user(const char *user, const char *host, const char *ipaddr,
     const char *pattern)
 {
        char *p, *pat;
@@ -217,9 +216,7 @@ match_user(const char *user, int verify_reverse_mapping,
        *p++ = '\0';
 
        if ((ret = match_pattern(user, pat)) == 1)
-               ret = match_host_and_ip(
-                   get_canonical_hostname(verify_reverse_mapping),
-                   get_remote_ipaddr(), p);
+               ret = match_host_and_ip(host, ipaddr, p);
        xfree(pat);
 
        return ret;
@@ -257,7 +254,7 @@ match_list(const char *client, const char *server, u_int *next)
                                ret = xstrdup(p);
                                if (next != NULL)
                                        *next = (cp == NULL) ?
-                                           strlen(c) : cp - c;
+                                           strlen(c) : (u_int)(cp - c);
                                xfree(c);
                                xfree(s);
                                return ret;