saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #48296 from rallytime/bp-48258

Browse source 
Back-port #48258 to 2018.3
This commit is contained in:
Nicole Thomas 2018-06-25 15:04:40 -04:00 • committed by GitHub
commit 27207fc510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/ldap3.py
View file

@ -411,7 +411,8 @@ def add(connect_spec, dn, attributes):
modlist = salt.utils.data.decode(
ldap.modlist.addModlist(attributes),
to_str=True
to_str=True,
preserve_tuples=True
)
try:
l.c.add_s(dn, modlist)
@ -512,7 +513,7 @@ def modify(connect_spec, dn, directives):
modlist[idx] = (mod[0], mod[1],
[_format_unicode_password(x) for x in mod[2]])
modlist = salt.utils.data.decode(modlist, to_str=True)
modlist = salt.utils.data.decode(modlist, to_str=True, preserve_tuples=True)
try:
l.c.modify_s(dn, modlist)
except ldap.LDAPError as e:
@ -581,7 +582,8 @@ def change(connect_spec, dn, before, after):
modlist = salt.utils.data.decode(
ldap.modlist.modifyModlist(before, after),
to_str=True
to_str=True,
preserve_tuples=True
)
try:
l.c.modify_s(dn, modlist)