From: Lukasz Zalewski <lukas@eecs.qmul.ac.uk>
Date: Wed, 9 May 2012 13:24:01 +0000 (+0100)
Subject: When listing group members allow fallback to cn attribute when samAccountName is... 
X-Git-Tag: samba-4.0.0alpha21~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be5bf2c991ce5ec2c5b2c19832430e26150d7d84;p=thirdparty%2Fsamba.git

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

diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py
index 265170d2d27..0f4a744acc5 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -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)