===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/addrmatch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/ssh/addrmatch.c	2008/06/10 05:22:45	1.2
+++ src/usr.bin/ssh/addrmatch.c	2008/06/10 23:06:19	1.3
@@ -1,4 +1,4 @@
-/*	$OpenBSD: addrmatch.c,v 1.2 2008/06/10 05:22:45 djm Exp $ */
+/*	$OpenBSD: addrmatch.c,v 1.3 2008/06/10 23:06:19 djm Exp $ */
 
 /*
  * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -364,7 +364,8 @@
  *
  * Returns 1 on match found (never returned when addr == NULL).
  * Returns 0 on if no match found, or no errors found when addr == NULL.
- * Returns -1 on invalid list entry.
+ * Returns -1 on negated match found (never returned when addr == NULL).
+ * Returns -2 on invalid list entry.
  */
 int
 addr_match_list(const char *addr, const char *_list)
@@ -385,7 +386,7 @@
 		if (neg)
 			cp++;
 		if (*cp == '\0') {
-			ret = -1;
+			ret = -2;
 			break;
 		}
 		/* Prefer CIDR address matching */
@@ -393,14 +394,14 @@
 		if (r == -2) {
 			error("Inconsistent mask length for "
 			    "network \"%.100s\"", cp);
-			ret = -1;
+			ret = -2;
 			break;
 		} else if (r == 0) {
 			if (addr != NULL && addr_netmatch(&try_addr,
                            &match_addr, masklen) == 0) {
  foundit:
 				if (neg) {
-					ret = 0;
+					ret = -1;
 					break;
 				}
 				ret = 1;