values need to be bytes when writing to ldap

saltstack · Oct 9, 2018 · 05e55bd · 05e55bd
1 parent 0d749e6
commit 05e55bd
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/salt/modules/ldap3.py b/salt/modules/ldap3.py
@@ -402,18 +402,14 @@ def add(connect_spec, dn, attributes):
     # convert the "iterable of values" to lists in case that's what
     # addModlist() expects (also to ensure that the caller's objects
     # are not modified)
-    attributes = dict(((attr, list(vals))
+    attributes = dict(((attr, salt.utils.data.encode(list(vals)))
                        for attr, vals in six.iteritems(attributes)))
     log.info('adding entry: dn: %s attributes: %s', repr(dn), repr(attributes))
 
     if 'unicodePwd' in attributes:
         attributes['unicodePwd'] = [_format_unicode_password(x) for x in attributes['unicodePwd']]
 
-    modlist = salt.utils.data.decode(
-        ldap.modlist.addModlist(attributes),
-        to_str=True,
-        preserve_tuples=True
-    )
+    modlist = ldap.modlist.addModlist(attributes),
     try:
         l.c.add_s(dn, modlist)
     except ldap.LDAPError as e: