From 969021984125c94b1058bf94681f295071849a22 Mon Sep 17 00:00:00 2001

From: Martin Basti <mbasti@redhat.com>

Date: Thu, 13 Nov 2014 18:22:22 +0100

Subject: [PATCH] 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>

---

 ipaserver/install/bindinstance.py | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py

index 16894de0a009aacb123cf76072f2556aebc5722f..5bf784e62aec7c323a84fc5130e53c3deb86e6fd 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))

-- 

2.1.0