summaryrefslogtreecommitdiff
path: root/lib/sbin/interface_parser.pl
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-11-02 10:03:02 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-11-02 10:03:02 +0000
commitd91830276ba8110f5d16078643324b5ad81fa4b8 (patch)
tree300b614128edc6993f0604b765732e43dd7b070a /lib/sbin/interface_parser.pl
parent023b6e12a846844b444cd189cd8b27db53861774 (diff)
Escape metacharacters when extracting a variable group description.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4189 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/interface_parser.pl')
-rw-r--r--lib/sbin/interface_parser.pl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl
index 27907626..5cdb9b7e 100644
--- a/lib/sbin/interface_parser.pl
+++ b/lib/sbin/interface_parser.pl
@@ -901,7 +901,7 @@ sub parse_interface_ccl
$interface_db{"\U$thorn GROUP $current_group\E VTYPE"} = "\U$vtype\E";
# Grab optional group description from end of $options_list
- if ($options_list =~ /(=?)\s*"([^"]*)"\s*$/) #"
+ if ($options_list =~ /(=?)\s*"([^"]*)"\s*$/)
{
if (!$1)
{
@@ -914,7 +914,8 @@ sub parse_interface_ccl
} else
{
$description = $2;
- $options_list =~ s/\s*"$description"//;
+ $quoted_description = quotemeta ($description);
+ $options_list =~ s/\s*"$quoted_description"//;
}
}
}
@@ -1066,7 +1067,7 @@ sub parse_interface_ccl
@functions = split(/[^a-zA-Z_0-9]+/, $data[$line_number]);
foreach $function (@functions)
{
- if ($function eq $current_group)
+ if ($function eq $current_group)
{
if ($#functions == 1)
{