|
 |
ab36df |
From 8fb02d5decac12c9b06b5e420e36e9d46c538c54 Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: Dominic Cleal <dcleal@redhat.com>
|
|
|
ab36df |
Date: Sat, 5 Oct 2013 17:04:15 +0100
|
|
|
ab36df |
Subject: [PATCH] Exports: permit colons for IPv6 client addresses
|
|
|
ab36df |
|
|
|
ab36df |
Fixes ticket #366
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 68955992ae548f9a65a4fb4cdbf2ffbe5520a50e)
|
|
|
ab36df |
---
|
|
|
ab36df |
lenses/exports.aug | 2 +-
|
|
|
ab36df |
lenses/tests/test_exports.aug | 4 ++++
|
|
|
ab36df |
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/lenses/exports.aug b/lenses/exports.aug
|
|
|
ab36df |
index 4e134c8..3de0de1 100644
|
|
|
ab36df |
--- a/lenses/exports.aug
|
|
|
ab36df |
+++ b/lenses/exports.aug
|
|
|
ab36df |
@@ -76,7 +76,7 @@ About: Limitations
|
|
|
ab36df |
module Exports =
|
|
|
ab36df |
autoload xfm
|
|
|
ab36df |
|
|
|
ab36df |
- let client_re = /[a-zA-Z0-9.@*?\/-]+/
|
|
|
ab36df |
+ let client_re = /[a-zA-Z0-9.@*?\/:-]+/
|
|
|
ab36df |
|
|
|
ab36df |
let eol = Util.eol
|
|
|
ab36df |
let lbracket = Util.del_str "("
|
|
|
ab36df |
diff --git a/lenses/tests/test_exports.aug b/lenses/tests/test_exports.aug
|
|
|
ab36df |
index 14a51e8..3d0e9c2 100644
|
|
|
ab36df |
--- a/lenses/tests/test_exports.aug
|
|
|
ab36df |
+++ b/lenses/tests/test_exports.aug
|
|
|
ab36df |
@@ -8,6 +8,7 @@ let s = "/local 172.31.0.0/16(rw,sync) \t
|
|
|
ab36df |
/local2 somehost(rw,sync)
|
|
|
ab36df |
/local3 some-host(rw,sync)
|
|
|
ab36df |
/local3 an-other-host(rw,sync)
|
|
|
ab36df |
+/local4 2000:123:456::/64(rw)
|
|
|
ab36df |
"
|
|
|
ab36df |
|
|
|
ab36df |
test Exports.lns get s =
|
|
|
ab36df |
@@ -43,3 +44,6 @@ test Exports.lns get s =
|
|
|
ab36df |
{ "client" = "an-other-host"
|
|
|
ab36df |
{ "option" = "rw" }
|
|
|
ab36df |
{ "option" = "sync" } } }
|
|
|
ab36df |
+ { "dir" = "/local4"
|
|
|
ab36df |
+ { "client" = "2000:123:456::/64"
|
|
|
ab36df |
+ { "option" = "rw" } } }
|