sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00
Code Activity

When listing group members allow fallback to cn attribute when samAccountName is not available

Browse Source
This commit is contained in:
Lukasz Zalewski
2012-05-09 14:24:01 +01:00
committed by Andrew Bartlett
parent d74c5a3dc4
commit be5bf2c991
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/python/samba/netcmd/group.py
View File

@ -346,13 +346,16 @@ samba-tool group listmembers \"Domain Users\" -H ldap://samba.samdom.example.com
search_filter = "(|(primaryGroupID=%s)(memberOf=%s))" % (rid, group_dn)
res = samdb.search(samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE,
expression=(search_filter),
attrs=["samAccountName"])
attrs=["samAccountName", "cn"])
if (len(res) == 0):
return
for msg in res:
self.outf.write("%s\n" % msg.get("samAccountName", idx=0))
member_name = msg.get("samAccountName", idx=0)
if member_name is None:
member_name = msg.get("cn", idx=0)
self.outf.write("%s\n" % member_name)
except Exception, e:
raise CommandError('Failed to list members of "%s" group ' % groupname, e)