aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-10-02 09:27:22 +0100
committerKeir Fraser <keir@xensource.com>2007-10-02 09:27:22 +0100
commitece8f4f2592288a1511afabc6ed35cbb2ef7c8b0 (patch)
treeb3b6fce138c52877772ecd2d0d366838a64dc854 /tools
parentc624ac637e414194d4ca147049eb6588581dc2be (diff)
downloadxen-ece8f4f2592288a1511afabc6ed35cbb2ef7c8b0.tar.gz
xen-ece8f4f2592288a1511afabc6ed35cbb2ef7c8b0.tar.bz2
xen-ece8f4f2592288a1511afabc6ed35cbb2ef7c8b0.zip
xend: Fix refactoring done in CS 15938 in security.py.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/util/xsm/acm/acm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/util/xsm/acm/acm.py b/tools/python/xen/util/xsm/acm/acm.py
index 52f6ad6333..d58652e06c 100644
--- a/tools/python/xen/util/xsm/acm/acm.py
+++ b/tools/python/xen/util/xsm/acm/acm.py
@@ -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 ""