diff options
| author | Martin Basti <[email protected]> | 2014-11-24 12:46:37 +0100 |
|---|---|---|
| committer | Jan Cholasta <[email protected]> | 2014-11-24 13:20:35 +0000 |
| commit | 880f1e5c277a8826e3334723cd840cae4e65dfb8 (patch) | |
| tree | 652672fdeefe893fe1c82e31e07cd09102204ba8 | |
| parent | 8ef191448f0511b9c1749f47615437d649db0777 (diff) | |
| download | freeipa-880f1e5c277a8826e3334723cd840cae4e65dfb8.tar.gz freeipa-880f1e5c277a8826e3334723cd840cae4e65dfb8.tar.xz freeipa-880f1e5c277a8826e3334723cd840cae4e65dfb8.zip | |
Fix detection of encoding in zonemgr option
Ticket: https://fedorahosted.org/freeipa/ticket/4762
Reviewed-By: Jan Cholasta <[email protected]>
| -rw-r--r-- | ipaserver/install/bindinstance.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 5bf784e62..f02fe8647 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -401,13 +401,14 @@ def zonemgr_callback(option, opt_str, value, parser): """ Properly validate and convert --zonemgr Option to IA5String """ - # 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)) + if value is not None: + # validate the value first + try: + # IDNA support requires unicode + value = value.decode(getattr(sys.stdin, 'encoding', 'utf-8')) + validate_zonemgr_str(value) + except ValueError, e: + parser.error("invalid zonemgr: " + unicode(e)) parser.values.zonemgr = value |