summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2014-11-13 18:22:22 +0100
committerPetr Vobornik <pvoborni@redhat.com>2014-11-19 13:37:48 +0100
commitd2ffd176176e20860998d29ede4e9bd65f398bf2 (patch)
tree17b843648ba7ec576bf4e7923d8b0517f69dc3e9
parenta86d8e80645291b567c9cdb3bfe8d57ff4ddccf0 (diff)
downloadfreeipa-d2ffd176176e20860998d29ede4e9bd65f398bf2.tar.gz
freeipa-d2ffd176176e20860998d29ede4e9bd65f398bf2.tar.xz
freeipa-d2ffd176176e20860998d29ede4e9bd65f398bf2.zip
Fix: zonemgr must be unicode value
To support IDNA --zonemgr option must be unicode not ascii https://fedorahosted.org/freeipa/ticket/4724 Reviewed-By: David Kupka <dkupka@redhat.com>
-rw-r--r--ipaserver/install/bindinstance.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 16894de0a..5bf784e62 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -403,6 +403,8 @@ def zonemgr_callback(option, opt_str, value, parser):
"""
# validate the value first
try:
+ # IDNA support requires unicode
+ value = value.decode(sys.stdin.encoding)
validate_zonemgr_str(value)
except ValueError, e:
parser.error("invalid zonemgr: " + unicode(e))