Merge branch 'master' of bitbucket.org:tmakinen/puppet

This commit is contained in:
Ossi Salmi 2013-07-22 21:23:18 +03:00
commit dfd3864264

View file

@ -24,7 +24,7 @@ def main():
def ldapsearch(filter):
p = Popen(['ldapsearch', '-x', '-z', '0', '-LLL', filter, 'cn', 'macAddress', 'ipHostNumber'],
p = Popen(['ldapsearch', '-x', '-z', '0', '-S', 'cn', '-LLL', filter, 'cn', 'macAddress', 'ipHostNumber'],
bufsize=1024, stdout=PIPE, close_fds=True)
ret = []
cur = {}