Blame SOURCES/bz1218478-fix-cluster-property-name-validation.patch
|
 |
22e37c |
From 289af7fd608a67d02494859302e465f19bb269bd Mon Sep 17 00:00:00 2001
|
|
|
22e37c |
From: Tomas Jelinek <tojeline@redhat.com>
|
|
|
22e37c |
Date: Thu, 7 May 2015 13:15:55 +0200
|
|
|
22e37c |
Subject: [PATCH] fix cluster property name validation
|
|
|
22e37c |
|
|
|
22e37c |
---
|
|
|
22e37c |
pcs/prop.py | 5 ++---
|
|
|
22e37c |
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
22e37c |
|
|
|
22e37c |
diff --git a/pcs/prop.py b/pcs/prop.py
|
|
|
22e37c |
index 3b1c15a..6d99032 100644
|
|
|
22e37c |
--- a/pcs/prop.py
|
|
|
22e37c |
+++ b/pcs/prop.py
|
|
|
22e37c |
@@ -32,9 +32,8 @@ def set_property(argv):
|
|
|
22e37c |
if "--node" in utils.pcs_options:
|
|
|
22e37c |
utils.set_node_attribute(args[0], args[1], utils.pcs_options["--node"])
|
|
|
22e37c |
elif ("--force" in utils.pcs_options) or utils.is_valid_property(args[0]):
|
|
|
22e37c |
- id_valid, id_error = utils.validate_xml_id(args[0], 'property name')
|
|
|
22e37c |
- if not id_valid:
|
|
|
22e37c |
- utils.err(id_error)
|
|
|
22e37c |
+ if not args[0]:
|
|
|
22e37c |
+ utils.err("property name cannot be empty")
|
|
|
22e37c |
utils.set_cib_property(args[0],args[1])
|
|
|
22e37c |
else:
|
|
|
22e37c |
utils.err("unknown cluster property: '%s', (use --force to override)" % args[0])
|
|
|
22e37c |
--
|
|
|
22e37c |
1.9.1
|
|
|
22e37c |
|