summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-07-20 14:08:38 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-07-20 14:08:38 +0000
commit686cd2c5b50b1a50bd3c942b8dde960b7b5fb5d8 (patch)
tree48ac846451fcb8e571151e8331b66726d297cf27 /plugins
parentf98a0675ce2937675483e9f30e1b36d72a5b52e4 (diff)
downloadnova-686cd2c5b50b1a50bd3c942b8dde960b7b5fb5d8.tar.gz
nova-686cd2c5b50b1a50bd3c942b8dde960b7b5fb5d8.tar.xz
nova-686cd2c5b50b1a50bd3c942b8dde960b7b5fb5d8.zip
Some older windows agents will crash if the public key for the keyinit command
is not a string.
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/agent4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index b8a1b936a..6c6b0930f 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -72,7 +72,9 @@ def key_init(self, arg_dict):
info to be passed, such as passwords. Returns the shared
secret key value.
"""
- pub = int(arg_dict["pub"])
+ # WARNING: Some older Windows agents will crash if the public key isn't
+ # a string
+ pub = arg_dict["pub"]
arg_dict["value"] = json.dumps({"name": "keyinit", "value": pub})
request_id = arg_dict["id"]
arg_dict["path"] = "data/host/%s" % request_id