[Xen-changelog] [xen-unstable] xend, acm: Prevent labeling of vlans with the same color

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1207218740 -3600
# Node ID 9a4c6b6a801df53cd38ea0d8bf1b1fdb46e9a937
# Parent  fedb66235136c9628cc263856473122d68c9ca81
xend, acm: Prevent labeling of vlans with the same color

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/python/xen/util/xsm/acm/acm.py |    3 +++
 1 files changed, 3 insertions(+)

diff -r fedb66235136 -r 9a4c6b6a801d tools/python/xen/util/xsm/acm/acm.py
--- a/tools/python/xen/util/xsm/acm/acm.py      Thu Apr 03 11:24:20 2008 +0100
+++ b/tools/python/xen/util/xsm/acm/acm.py      Thu Apr 03 11:32:20 2008 +0100
@@ -1219,6 +1219,9 @@ def set_resource_label(resource, policyt
             if len(tmp) != 3:
                 return -xsconstants.XSERR_BAD_LABEL
             if tmp[2] != oreslabel:
+                return -xsconstants.XSERR_BAD_LABEL
+        if resource.startswith('vlan:'):
+            if tuple([policytype, policyref, reslabel]) in 
access_control.values():
                 return -xsconstants.XSERR_BAD_LABEL
         if reslabel != "":
             new_entry = { resource : tuple([policytype, policyref, reslabel])}

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog