diff options
| author | Pavel Březina <pbrezina@redhat.com> | 2012-12-13 12:08:20 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2012-12-14 17:45:19 +0100 |
| commit | 746e6fc5d910aaf9ea0077f675901f2584c16781 (patch) | |
| tree | b7d991f6cd5dc19dbeb595a12eab7303bbd06858 /src | |
| parent | ed82eacfa418b851036bbb2e3578e6784b72475e (diff) | |
| download | sssd-746e6fc5d910aaf9ea0077f675901f2584c16781.tar.gz sssd-746e6fc5d910aaf9ea0077f675901f2584c16781.tar.xz sssd-746e6fc5d910aaf9ea0077f675901f2584c16781.zip | |
sudo: include primary group in user group list1.9.2-43
https://fedorahosted.org/sssd/ticket/1677
Diffstat (limited to 'src')
| -rw-r--r-- | src/db/sysdb_sudo.c | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/src/db/sysdb_sudo.c b/src/db/sysdb_sudo.c index 9e849ddb0..c1845f9be 100644 --- a/src/db/sysdb_sudo.c +++ b/src/db/sysdb_sudo.c @@ -291,13 +291,20 @@ sysdb_get_sudo_user_info(TALLOC_CTX *mem_ctx, const char *username, TALLOC_CTX *tmp_ctx; errno_t ret; struct ldb_message *msg; + struct ldb_message *group_msg = NULL; char **sysdb_groupnames = NULL; + const char *primary_group = NULL; struct ldb_message_element *groups; uid_t uid = 0; + gid_t gid = 0; + size_t num_groups = 0; int i; const char *attrs[] = { SYSDB_MEMBEROF, + SYSDB_GIDNUM, SYSDB_UIDNUM, NULL }; + const char *group_attrs[] = { SYSDB_NAME, + NULL }; tmp_ctx = talloc_new(NULL); NULL_CHECK(tmp_ctx, ret, done); @@ -318,13 +325,16 @@ sysdb_get_sudo_user_info(TALLOC_CTX *mem_ctx, const char *username, } } + /* resolve secondary groups */ if (groupnames != NULL) { groups = ldb_msg_find_element(msg, SYSDB_MEMBEROF); if (!groups || groups->num_values == 0) { /* No groups for this user in sysdb currently */ sysdb_groupnames = NULL; + num_groups = 0; } else { - sysdb_groupnames = talloc_array(tmp_ctx, char *, groups->num_values+1); + num_groups = groups->num_values; + sysdb_groupnames = talloc_array(tmp_ctx, char *, num_groups + 1); NULL_CHECK(sysdb_groupnames, ret, done); /* Get a list of the groups by groupname only */ @@ -342,6 +352,36 @@ sysdb_get_sudo_user_info(TALLOC_CTX *mem_ctx, const char *username, } } + /* resolve primary group */ + gid = ldb_msg_find_attr_as_uint64(msg, SYSDB_GIDNUM, 0); + if (gid != 0) { + ret = sysdb_search_group_by_gid(tmp_ctx, sysdb, gid, + group_attrs, &group_msg); + if (ret == EOK) { + primary_group = ldb_msg_find_attr_as_string(group_msg, SYSDB_NAME, + NULL); + if (primary_group == NULL) { + ret = ENOMEM; + goto done; + } + + num_groups++; + sysdb_groupnames = talloc_realloc(tmp_ctx, sysdb_groupnames, + char *, num_groups + 1); + NULL_CHECK(sysdb_groupnames, ret, done); + + sysdb_groupnames[num_groups - 1] = talloc_strdup(sysdb_groupnames, + primary_group); + NULL_CHECK(sysdb_groupnames[num_groups - 1], ret, done); + + sysdb_groupnames[num_groups] = NULL; + } else if (ret != ENOENT) { + DEBUG(SSSDBG_CRIT_FAILURE, ("Error looking up group [%d]: %s\n", + ret, strerror(ret))); + goto done; + } + } + ret = EOK; if (_uid != NULL) { |