summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2012-02-10 13:40:47 -0800
committerJohn Southworth <john.southworth@vyatta.com>2012-02-10 13:40:47 -0800
commitd842b1b037f9763b7ff8eaa84b586966ffa77bf3 (patch)
treee2e6d066f2f8bac52be91b30dab237fbd7d377a9
parenta40cf7504c78ebc42bf43362a2459d3ef1a07d94 (diff)
parent732670fb2f724a2491c9729643d110d95ee6403c (diff)
downloadvyatta-cfg-qos-d842b1b037f9763b7ff8eaa84b586966ffa77bf3.tar.gz
vyatta-cfg-qos-d842b1b037f9763b7ff8eaa84b586966ffa77bf3.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-qos into changes-john-southworth
-rw-r--r--debian/changelog7
-rw-r--r--interface-templates/redirect/node.def2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 29f27ab..03eb62e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-qos (0.15.30) unstable; urgency=low
+
+ * Bugfix 7784: Need quotes in syntax:expression when using more than
+ just VAR refs
+
+ -- John Southworth <john.southworth@vyatta.com> Fri, 10 Feb 2012 13:40:36 -0800
+
vyatta-cfg-qos (0.15.29) unstable; urgency=low
* Allow redirect on all interfaces
diff --git a/interface-templates/redirect/node.def b/interface-templates/redirect/node.def
index 50788ca..6b39f67 100644
--- a/interface-templates/redirect/node.def
+++ b/interface-templates/redirect/node.def
@@ -2,7 +2,7 @@ type: txt
help: Incoming packet redirection destination
allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=input
-syntax:expression: $VAR(@) != $IFNAME ;\
+syntax:expression: $VAR(@) != "$IFNAME" ;\
"interface $IFNAME: redirect to same interface not allowed"
val_help: Interface for packet redirection