===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/addrmatch.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/ssh/addrmatch.c	2008/06/10 03:57:27	1.1
+++ src/usr.bin/ssh/addrmatch.c	2008/06/10 05:22:45	1.2
@@ -1,4 +1,4 @@
-/*	$OpenBSD: addrmatch.c,v 1.1 2008/06/10 03:57:27 djm Exp $ */
+/*	$OpenBSD: addrmatch.c,v 1.2 2008/06/10 05:22:45 djm Exp $ */
 
 /*
  * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -374,8 +374,10 @@
 	u_int masklen, neg;
 	int ret = 0, r;
 
-	if (addr != NULL && addr_pton(addr, &try_addr) != 0)
-		fatal("%s: addr_pton(%s)", __func__, addr);
+	if (addr != NULL && addr_pton(addr, &try_addr) != 0) {
+		debug2("%s: couldn't parse address %.100s", __func__, addr);
+		return 0;
+	}
 	if ((o = list = strdup(_list)) == NULL)
 		return -1;
 	while ((cp = strsep(&list, ",")) != NULL) {