openldap module: Fix python3's bytes vs str mismatch.

1 files changed, 30 insertions, 30 deletions

diff --git a/lib/modules/openldap b/lib/modules/openldap
index 219c9a6..c09e791 100644
--- a/lib/modules/openldap
+++ b/lib/modules/openldap
@@ -49,10 +49,10 @@ indexedAttributes = frozenset([
 # ('%s' in the attribute value is replaced with the value of the source
 # entry.)
 indexedDN = {
-    'olcSchemaConfig':  [('cn',             '{*}%s')],
-    'olcMdbConfig':     [('olcDbDirectory', '%s'   )],
-    'olcOverlayConfig': [('olcOverlay',     '%s'   )],
-    'olcMonitorConfig': [],
+    b'olcSchemaConfig':  [('cn',             '{*}%s')],
+    b'olcMdbConfig':     [('olcDbDirectory', '%s'   )],
+    b'olcOverlayConfig': [('olcOverlay',     '%s'   )],
+    b'olcMonitorConfig': [],
 }
 
 # Allow for flexible ACLs for user using SASL's EXTERNAL mechanism.
@@ -60,23 +60,23 @@ indexedDN = {
 # "gidNumber=106+uidNumber=102,cn=peercred,cn=external,cn=auth" where
 # 102 is postfix's UID and 106 its primary GID.
 # (Regular expressions are not allowed.)
-sasl_ext_re = re.compile( r"""(?P<start>\sby\s+dn(?:\.exact)?)=
+sasl_ext_re = re.compile( b"""(?P<start>\sby\s+dn(?:\.exact)?)=
                               (?P<quote>['\"]?)username=(?P<user>_?[a-z][-a-z0-9_]*),
                               (?P<end>cn=peercred,cn=external,cn=auth)
                               (?P=quote)\s"""
                         , re.VERBOSE )
-multispaces = re.compile( r"\s+" )
+multispaces = re.compile( b"\s+" )
 pwd_dict = {}
 
 def acl_sasl_ext(m):
-    u = m.group('user')
+    u = m.group('user').decode("utf-8")
     if u not in pwd_dict.keys():
         pwd_dict[u] = pwd.getpwnam(u)
-    return '%s="gidNumber=%d+uidNumber=%d,%s" ' % ( m.group('start')
-                                                  , pwd_dict[u].pw_gid
-                                                  , pwd_dict[u].pw_uid
-                                                  , m.group('end')
-                                                  )
+    return b'%s="gidNumber=%d+uidNumber=%d,%s" ' % ( m.group('start')
+                                                   , pwd_dict[u].pw_gid
+                                                   , pwd_dict[u].pw_uid
+                                                   , m.group('end')
+                                                   )
 
 
 # Run the given callback on each DN seen.  If its return value is not
@@ -109,14 +109,14 @@ def flexibleSearch(module, l, dn, entry):
         scope = ldap.SCOPE_ONELEVEL
         f = []
         for c in idxClasses:
-            f.append ( filter_format('objectClass=%s', [c]) )
+            f.append ( filter_format('objectClass=%s', [c.decode("utf-8")]) )
             for a,v in indexedDN[c]:
                 if a == h:
                     v2 = t
                 elif a not in entry.keys() or len(entry[a]) > 1:
                     module.fail_json(msg="Multiple values found! This is a bug. Please report.")
                 else:
-                    v2 = entry[a][0]
+                    v2 = entry[a][0].decode("utf-8")
                 f.append ( filter_format(a+'='+v, [v2]) )
         if len(f) == 1:
             f = f[0]
@@ -139,7 +139,7 @@ def processEntry(module, l, dn, entry):
 
     for x in indexedAttributes.intersection(entry.keys()):
         # remove useless extra spaces in ACLs etc
-        entry[x] = list(map( partial(multispaces.sub, ' '), entry[x] ))
+        entry[x] = list(map( partial(multispaces.sub, b' '), entry[x] ))
 
     r = flexibleSearch( module, l, dn, entry )
     if r is None:
@@ -156,7 +156,7 @@ def processEntry(module, l, dn, entry):
         d,e = r
         fst = str2dn(dn).pop(0)[0][0]
         diff = []
-        for a,v in e.iteritems():
+        for a,v in e.items():
             if a not in entry.keys():
                 if a != fst:
                     # delete all values except for the first attribute,
@@ -169,7 +169,7 @@ def processEntry(module, l, dn, entry):
                     entry[a] = list(map ( partial(sasl_ext_re.sub, acl_sasl_ext)
                                         , entry[a] ))
                 # add explicit indices in the entry from the LDIF
-                entry[a] = list(map( (lambda x: '{%d}%s' % x)
+                entry[a] = list(map( (lambda x: b'{%d}%s' % x)
                                    , zip(range(len(entry[a])),entry[a])))
                 if v != entry[a]:
                     diff.append(( ldap.MOD_REPLACE, a, entry[a] ))
@@ -231,31 +231,31 @@ def getDN_DB(module, l, a, v, attrlist=['']):
 # Convert a *.schema file into *.ldif format. The algorithm can be found
 # in /etc/ldap/schema/openldap.ldif .
 def slapd_to_ldif(src, name):
-    s = open( src, 'r' )
+    s = open( src, 'rb' )
     d = tempfile.NamedTemporaryFile(delete=False)
     atexit.register(lambda: os.unlink( d.name ))
 
-    d.write('dn: cn=%s,cn=schema,cn=config\n' % name)
-    d.write('objectClass: olcSchemaConfig\n')
+    d.write(b'dn: cn=%s,cn=schema,cn=config\n' % name.encode("utf-8"))
+    d.write(b'objectClass: olcSchemaConfig\n')
 
-    re1 = re.compile( r'^objectIdentifier\s(.*)', re.I )
-    re2 = re.compile( r'^objectClass\s(.*)',      re.I )
-    re3 = re.compile( r'^attributeType\s(.*)',    re.I )
-    reSp = re.compile( r'^\s+' )
+    re1 = re.compile( b'^objectIdentifier\s(.*)', re.I )
+    re2 = re.compile( b'^objectClass\s(.*)',      re.I )
+    re3 = re.compile( b'^attributeType\s(.*)',    re.I )
+    reSp = re.compile( b'^\s+' )
     for line in s.readlines():
-        if line == '\n':
-            line = '#\n'
+        if line == b'\n':
+            line = b'#\n'
         m1 = re1.match(line)
         m2 = re2.match(line)
         m3 = re3.match(line)
         if m1 is not None:
-            line = 'olcObjectIdentifier: %s' % m1.group(1)
+            line = b'olcObjectIdentifier: %s' % m1.group(1)
         elif m2 is not None:
-            line = 'olcObjectClasses: %s'    % m2.group(1)
+            line = b'olcObjectClasses: %s'    % m2.group(1)
         elif m3 is not None:
-            line = 'olcAttributeTypes: %s'   % m3.group(1)
+            line = b'olcAttributeTypes: %s'   % m3.group(1)
 
-        d.write( reSp.sub(line, '  ') )
+        d.write( reSp.sub(line, b'  ') )
 
 
     s.close()