|
 |
ab36df |
From 8d7929bdae06fcfc06eeb24448f2af5fd78821cc Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: Dominic Cleal <dcleal@redhat.com>
|
|
|
ab36df |
Date: Mon, 21 Jul 2014 08:15:06 +0100
|
|
|
ab36df |
Subject: [PATCH] Services: permit colons in service name
|
|
|
ab36df |
|
|
|
ab36df |
Fixes RHBZ#1121263
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit a32a5a395bc63094ba59857fd5dc329c28ddee32)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
---
|
|
|
ab36df |
lenses/services.aug | 2 +-
|
|
|
ab36df |
lenses/tests/test_services.aug | 7 +++++++
|
|
|
ab36df |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/lenses/services.aug b/lenses/services.aug
|
|
|
ab36df |
index 338737d..bad590f 100644
|
|
|
ab36df |
--- a/lenses/services.aug
|
|
|
ab36df |
+++ b/lenses/services.aug
|
|
|
ab36df |
@@ -47,7 +47,7 @@ let comment = Util.comment
|
|
|
ab36df |
let comment_or_eol = Util.comment_or_eol
|
|
|
ab36df |
let empty = Util.empty
|
|
|
ab36df |
let protocol_re = /[a-zA-Z]+/
|
|
|
ab36df |
-let word_re = /[a-zA-Z0-9_.+*\/-]+/
|
|
|
ab36df |
+let word_re = /[a-zA-Z0-9_.+*\/:-]+/
|
|
|
ab36df |
let num_re = /[0-9]+/
|
|
|
ab36df |
|
|
|
ab36df |
(* Group: Separators *)
|
|
|
ab36df |
diff --git a/lenses/tests/test_services.aug b/lenses/tests/test_services.aug
|
|
|
ab36df |
index aef5143..28725fe 100644
|
|
|
ab36df |
--- a/lenses/tests/test_services.aug
|
|
|
ab36df |
+++ b/lenses/tests/test_services.aug
|
|
|
ab36df |
@@ -79,3 +79,10 @@ z39.50 210/tcp z3950 wais # NISO Z39.50 database \n"
|
|
|
ab36df |
{ "end" = "6063" }
|
|
|
ab36df |
{ "protocol" = "tcp" }
|
|
|
ab36df |
{ "#comment" = "X Window System" } }
|
|
|
ab36df |
+
|
|
|
ab36df |
+ (* Colons permitted in service names, RHBZ#1121263 *)
|
|
|
ab36df |
+ test Services.lns get "SWRPC.ACCESS.BSS:BS_rmq 48102/tcp # SWIFTAlliance_SWRPC ACCESS\n" =
|
|
|
ab36df |
+ { "service-name" = "SWRPC.ACCESS.BSS:BS_rmq"
|
|
|
ab36df |
+ { "port" = "48102" }
|
|
|
ab36df |
+ { "protocol" = "tcp" }
|
|
|
ab36df |
+ { "#comment" = "SWIFTAlliance_SWRPC ACCESS" } }
|