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 #47076 from terminalmage/issue46859

Browse source 
pillar_ldap: Load config options as str types
This commit is contained in:
Nicole Thomas 2018-04-18 12:16:22 -04:00 • committed by GitHub
commit c12697b173
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/ldapmod.py
View file

@ -86,7 +86,7 @@ def _config(name, key=None, **kwargs):
value = kwargs[name]
else:
value = __salt__['config.option']('ldap.{0}'.format(key))
return value
return salt.utils.data.decode(value, to_str=True)
def _connect(**kwargs):
@ -141,7 +141,7 @@ def search(filter, # pylint: disable=C0103
if attrs == '': # Allow command line 'return all' attr override
attrs = None
elif attrs is None:
attrs = salt.utils.data.decode(_config('attrs'), to_str=True)
attrs = _config('attrs')
_ldap = _connect(**kwargs)
start = time.time()
log.debug(

3
salt/pillar/pillar_ldap.py
View file

@ -118,6 +118,7 @@ import os
import logging
# Import salt libs
import salt.utils.data
from salt.exceptions import SaltInvocationError
# Import third party libs
@ -158,7 +159,7 @@ def _config(name, conf):
Return a value for 'name' from the config file options.
'''
try:
value = conf[name]
value = salt.utils.data.decode(conf[name], to_str=True)
except KeyError:
value = None
return value