bridge: Forbid '/' in bridge names to prevent arbitrary directory access.

[openvswitch] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 56d4a1c2aea2e9caa64ba65ce1a35d79ac674964..d579b8722ee255a43f5cafd32621f8306c4a24a8 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -933,7 +933,7 @@
             not support GRE.  Only the tunneling component of the protocol is
             implemented.  UDP ports 58881 and 58882 are used as the source and
             destination ports respectively.  CAPWAP is currently supported only
-            with the Linux kernel datapath with kernel version 2.6.25 or later.
+            with the Linux kernel datapath with kernel version 2.6.26 or later.
           </dd>
 
           <dt><code>patch</code></dt>
@@ -1461,7 +1461,8 @@
         compatibility with 802.1ag compliant implementations.  Defaults to
         <code>false</code>.
       </column>
-      <column name="other_config" key="cfm_opstate">
+      <column name="other_config" key="cfm_opstate"
+              type='{"type": "string", "enum": ["set", ["down", "up"]]}'>
         When <code>down</code>, the CFM module marks all CCMs it generates as
         operationally down without triggering a fault.  This allows remote
         maintenance points to choose not to forward traffic to the