From 79ffda8e10492e472a164582d785451cc366b4f0 Mon Sep 17 00:00:00 2001
From: Jerome Borsboom <j.borsboom@erasmusmc.nl>
Date: Tue, 29 May 2007 12:59:54 -0700
Subject: [PATCH] --- yaml --- r: 57156 b: refs/heads/master c:
 83f03fa5adbad0a829424241ad24ef9e4b4ba585 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/core/utils.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2acdf0655097..e47bc15049d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ebba6d14f8d63cad583bf1cc0330b601d5a8171
+refs/heads/master: 83f03fa5adbad0a829424241ad24ef9e4b4ba585
diff --git a/trunk/net/core/utils.c b/trunk/net/core/utils.c
index adecfd281ae9..2030bb8c2d30 100644
--- a/trunk/net/core/utils.c
+++ b/trunk/net/core/utils.c
@@ -139,16 +139,16 @@ int in4_pton(const char *src, int srclen,
 	while(1) {
 		int c;
 		c = xdigit2bin(srclen > 0 ? *s : '\0', delim);
-		if (!(c & (IN6PTON_DIGIT | IN6PTON_DOT | IN6PTON_DELIM))) {
+		if (!(c & (IN6PTON_DIGIT | IN6PTON_DOT | IN6PTON_DELIM | IN6PTON_COLON_MASK))) {
 			goto out;
 		}
-		if (c & (IN6PTON_DOT | IN6PTON_DELIM)) {
+		if (c & (IN6PTON_DOT | IN6PTON_DELIM | IN6PTON_COLON_MASK)) {
 			if (w == 0)
 				goto out;
 			*d++ = w & 0xff;
 			w = 0;
 			i++;
-			if (c & IN6PTON_DELIM) {
+			if (c & (IN6PTON_DELIM | IN6PTON_COLON_MASK)) {
 				if (i != 4)
 					goto out;
 				break;