diff options
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/server/common.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/server/replicainstall.py | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index c2d69064d..bd1035172 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -7,6 +7,8 @@ from __future__ import print_function import os import sys +import six + from ipapython.dn import DN from ipapython.install import common, core from ipapython.install.core import Knob @@ -14,6 +16,9 @@ from ipalib.util import validate_domain_name from ipaserver.install import bindinstance from ipapython.ipautil import check_zone_overlap +if six.PY3: + unicode = str + VALID_SUBJECT_ATTRS = ['st', 'o', 'ou', 'dnqualifier', 'c', 'serialnumber', 'l', 'title', 'sn', 'givenname', 'initials', 'generationqualifier', 'dc', 'mail', diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 7edee88e1..41d14f580 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -15,6 +15,8 @@ import socket import sys import tempfile +import six + from ipapython import ipaldap, ipautil, sysrestore from ipapython.dn import DN from ipapython.install.common import step @@ -40,6 +42,9 @@ from binascii import hexlify from .common import BaseServer +if six.PY3: + unicode = str + DIRMAN_DN = DN(('cn', 'directory manager')) |