diff options
| author | Martin Basti <mbasti@redhat.com> | 2014-11-25 14:03:27 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2014-11-25 13:15:44 +0000 |
| commit | c13862104ab64cda81c86c51b849c8d01c3c9187 (patch) | |
| tree | 32551ea1b2255e8e060b8a452df8c729c4970bf5 /ipaserver | |
| parent | 4d1ce9e422c139cff2ec1de798a34f13c9b6fb95 (diff) | |
| download | freeipa-c13862104ab64cda81c86c51b849c8d01c3c9187.tar.gz freeipa-c13862104ab64cda81c86c51b849c8d01c3c9187.tar.xz freeipa-c13862104ab64cda81c86c51b849c8d01c3c9187.zip | |
Fix zonemgr option encoding detection
Ticket: https://fedorahosted.org/freeipa/ticket/4766
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index f02fe8647..547cf19ee 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -405,7 +405,10 @@ def zonemgr_callback(option, opt_str, value, parser): # validate the value first try: # IDNA support requires unicode - value = value.decode(getattr(sys.stdin, 'encoding', 'utf-8')) + encoding = getattr(sys.stdin, 'encoding', None) + if encoding is None: + encoding = 'utf-8' + value = value.decode(encoding) validate_zonemgr_str(value) except ValueError, e: parser.error("invalid zonemgr: " + unicode(e)) |