From a95935d72ff61edba2002cffebc6a247f6dae5e5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 10 Aug 2009 13:59:22 -0400
Subject: Fix IPv6 address checking (#516319)

---
 src/ipcalc-tests | 1 +
 src/ipcalc.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ipcalc-tests b/src/ipcalc-tests
index 53019cf4..ebb777d3 100755
--- a/src/ipcalc-tests
+++ b/src/ipcalc-tests
@@ -68,6 +68,7 @@ TestSuccess "$bin -c -6 2a01:198:200:300::2"
 TestSuccess "$bin -c -6 2a01:198:200:300:0000:0000:0000:2"
 TestSuccess "$bin -c -6 2a01:0198:0200:0300:0000:0000:0000:0002"
 TestSuccess "$bin -c -6 ::1/128"
+TestSuccess "$bin -c -6 fec0::1:0:0:c0a8:8002/64"
 
 TestFailure "$bin -c -6 gggg::"
 TestFailure "$bin -b -6 ::1/128"
diff --git a/src/ipcalc.c b/src/ipcalc.c
index 6f1be64b..c93e8329 100644
--- a/src/ipcalc.c
+++ b/src/ipcalc.c
@@ -336,7 +336,7 @@ int main(int argc, const char **argv) {
     }
 
     /* Handle CIDR entries such as 172/8 */
-    if (prefix >= 0) {
+    if (prefix >= 0 && familyIPv4) {
         char *tmp = ipStr;
         int i;
 
-- 
cgit v1.2.1