samba-tool: print samaccountname in samba-tool user list

this is the attribute the admin needs for other commands

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 1d84a3391caee1f829caf07589f09121c0cebe67..23c751525911c4a292f936da91d1f5f97e0e7bb6 100644 (file)
--- 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):