[Xen-changelog] [xen-unstable] xend: Fix refactoring done in CS 15938 in security.py.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191313642 -3600
# Node ID 74e385194be40e56d3705ff943ff3afe3b8d5f66
# Parent  9a39dac6660a8f49f9508a1222c59c3d319d2c96
xend: Fix refactoring done in CS 15938 in security.py.
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/python/xen/util/xsm/acm/acm.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 9a39dac6660a -r 74e385194be4 tools/python/xen/util/xsm/acm/acm.py
--- a/tools/python/xen/util/xsm/acm/acm.py      Tue Oct 02 09:26:18 2007 +0100
+++ b/tools/python/xen/util/xsm/acm/acm.py      Tue Oct 02 09:27:22 2007 +0100
@@ -1309,7 +1309,7 @@ def parse_security_label(security_label)
         return security_label
 
 def set_security_label(policy, label):
-    if label != "" and policy != "":
+    if label and policy and label != "" and policy != "":
         return "%s:%s:%s" % (xsconstants.ACM_POLICY_ID, policy, label)
     else:
         return ""

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