- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / match.c

diff --git a/match.c b/match.c
index 51407b8181e996f97fe6d97c177c31178b945733..2389477789043df3384bfcad1e4858279b99cf5d 100644 (file)
--- a/match.c
+++ b/match.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: match.c,v 1.27 2008/06/10 23:06:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,12 +36,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: match.c,v 1.21 2006/02/22 00:04:44 stevesk Exp $");
+
+#include <sys/types.h>
 
 #include <ctype.h>
+#include <string.h>
 
-#include "match.h"
 #include "xmalloc.h"
+#include "match.h"
 
 /*
  * Returns true if the given string matches the pattern (which may contain ?
@@ -138,7 +141,7 @@ match_pattern_list(const char *string, const char *pattern, u_int len,
                    i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
                    subi++, i++)
                        sub[subi] = dolower && isupper(pattern[i]) ?
-                           tolower(pattern[i]) : pattern[i];
+                           (char)tolower(pattern[i]) : pattern[i];
                /* If subpattern too long, return failure (no match). */
                if (subi >= sizeof(sub) - 1)
                        return 0;
@@ -180,7 +183,8 @@ match_hostname(const char *host, const char *pattern, u_int len)
 
 /*
  * returns 0 if we get a negative match for the hostname or the ip
- * or if we get no match at all.  returns 1 otherwise.
+ * or if we get no match at all.  returns -1 on error, or 1 on
+ * successful match.
  */
 int
 match_host_and_ip(const char *host, const char *ipaddr,
@@ -188,9 +192,12 @@ match_host_and_ip(const char *host, const char *ipaddr,
 {
        int mhost, mip;
 
-       /* negative ipaddr match */
-       if ((mip = match_hostname(ipaddr, patterns, strlen(patterns))) == -1)
+       /* error in ipaddr match */
+       if ((mip = addr_match_list(ipaddr, patterns)) == -2)
+               return -1;
+       else if (mip == -1) /* negative ip address match */
                return 0;
+
        /* negative hostname match */
        if ((mhost = match_hostname(host, patterns, strlen(patterns))) == -1)
                return 0;