From 862823a7764c692282dec7a93e7d37feeb924eef Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Nov 2011 13:27:20 +1100 Subject: [PATCH] samba-tool: print samaccountname in samba-tool user list this is the attribute the admin needs for other commands Pair-Programmed-With: Amitay Isaacs --- source4/scripting/python/samba/netcmd/user.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py index 1d84a3391ca..23c75152591 100644 --- a/source4/scripting/python/samba/netcmd/user.py +++ b/source4/scripting/python/samba/netcmd/user.py @@ -208,15 +208,12 @@ class cmd_user_list(Command): res = samdb.search(domain_dn, scope=ldb.SCOPE_SUBTREE, expression=("(&(objectClass=user)(userAccountControl:%s:=%u))" % (ldb.OID_COMPARATOR_AND, dsdb.UF_NORMAL_ACCOUNT)), - attrs=["name"]) + attrs=["samaccountname"]) if (len(res) == 0): return - try: - for msg in res: - self.outf.write("%s\n" % msg["name"][0]) - except Exception, msg: - raise CommandError("Failed to get user list: %s" % msg) + for msg in res: + self.outf.write("%s\n" % msg.get("samaccountname", idx=0)) class cmd_user_enable(Command): -- 2.34.1