From bd8cf980dc2e7035a8ce893df4a8ccaf9bbf11ad Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 2 May 2014 19:15:17 +0200 Subject: SYSDB: return SYSDB_NAME from sysdb_initgroups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the GetGroupsList function it would be handy to get the user names as well with a single sysdb_initgroups() call. This patch adds SYSDB_NAME to the default attribute list. Reviewed-by: Pavel Březina (cherry picked from commit cf2cc44d6293165379d6470b8bf6bb6a87d62b31) --- src/db/sysdb.h | 1 + src/tests/sysdb-tests.c | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 5bd2c50eb..aad641dca 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -195,6 +195,7 @@ SYSDB_DEFAULT_ATTRS, \ SYSDB_ORIG_DN, \ SYSDB_SID_STR, \ + SYSDB_NAME, \ NULL} #define SYSDB_TMPL_USER SYSDB_NAME"=%s,"SYSDB_TMPL_USER_BASE diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c index b3baa37e2..34ed4696b 100644 --- a/src/tests/sysdb-tests.c +++ b/src/tests/sysdb-tests.c @@ -1330,6 +1330,11 @@ START_TEST (test_sysdb_initgroups) "Did not find the expected UID (found %d expected %d)", uid, _i); + fail_unless(strcmp(ldb_msg_find_attr_as_string(user, SYSDB_NAME, NULL), + username) == 0, + "Wrong username\n"); + + gid = ldb_msg_find_attr_as_uint(group, SYSDB_GIDNUM, 0); fail_unless(gid == _i + 1000, "Did not find the expected GID (found %d expected %d)", -- cgit