diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2011-11-16 13:57:26 +0100 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-12-16 14:46:16 -0500 |
commit | 70a33bdf7db34fe4d1ba194cf9ea28c758719b4b (patch) | |
tree | 4f93e18380fe1ca2d41fca0b5c8fb9d8b77ee781 /src/providers/ldap/sdap_async_groups.c | |
parent | b3b42c49656e192787a983aaa8b9ec744ba4cb9d (diff) | |
download | sssd-70a33bdf7db34fe4d1ba194cf9ea28c758719b4b.tar.gz sssd-70a33bdf7db34fe4d1ba194cf9ea28c758719b4b.tar.bz2 sssd-70a33bdf7db34fe4d1ba194cf9ea28c758719b4b.zip |
Refactor saving sdap entities
There was too much code duplication between
sdap_save_{user,group,netgroup}. This patch removes the most egregious ones.
Diffstat (limited to 'src/providers/ldap/sdap_async_groups.c')
-rw-r--r-- | src/providers/ldap/sdap_async_groups.c | 49 |
1 files changed, 10 insertions, 39 deletions
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index d27e0386..750ac998 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -222,11 +222,9 @@ static int sdap_save_group(TALLOC_CTX *memctx, const char *name = NULL; gid_t gid; int ret; - int i; char *usn_value = NULL; TALLOC_CTX *tmpctx = NULL; bool posix_group; - const char **aliases = NULL; tmpctx = talloc_new(memctx); if (!tmpctx) { @@ -282,38 +280,19 @@ static int sdap_save_group(TALLOC_CTX *memctx, /* Group ID OK */ } - ret = sysdb_attrs_get_el(attrs, SYSDB_ORIG_DN, &el); - if (ret) { + ret = sdap_attrs_add_string(attrs, SYSDB_ORIG_DN, "original DN", + name, group_attrs); + if (ret != EOK) { goto fail; } - if (el->num_values == 0) { - DEBUG(7, ("Original DN is not available for [%s].\n", name)); - } else { - DEBUG(7, ("Adding original DN [%s] to attributes of [%s].\n", - el->values[0].data, name)); - ret = sysdb_attrs_add_string(group_attrs, SYSDB_ORIG_DN, - (const char *) el->values[0].data); - if (ret) { - goto fail; - } - } - ret = sysdb_attrs_get_el(attrs, - opts->group_map[SDAP_AT_GROUP_MODSTAMP].sys_name, &el); - if (ret) { + ret = sdap_attrs_add_string(attrs, + opts->group_map[SDAP_AT_GROUP_MODSTAMP].sys_name, + "original mod-Timestamp", + name, group_attrs); + if (ret != EOK) { goto fail; } - if (el->num_values == 0) { - DEBUG(7, ("Original mod-Timestamp is not available for [%s].\n", - name)); - } else { - ret = sysdb_attrs_add_string(group_attrs, - opts->group_map[SDAP_AT_GROUP_MODSTAMP].sys_name, - (const char*)el->values[0].data); - if (ret) { - goto fail; - } - } ret = sysdb_attrs_get_el(attrs, opts->group_map[SDAP_AT_GROUP_USN].sys_name, &el); @@ -369,20 +348,12 @@ static int sdap_save_group(TALLOC_CTX *memctx, } } - ret = sysdb_attrs_get_aliases(tmpctx, attrs, name, &aliases); + ret = sdap_save_all_names(name, attrs, group_attrs); if (ret != EOK) { - DEBUG(1, ("Failed to get the alias list\n")); + DEBUG(1, ("Failed to save user names\n")); goto fail; } - for (i = 0; aliases[i]; i++) { - ret = sysdb_attrs_add_string(group_attrs, SYSDB_NAME_ALIAS, - aliases[i]); - if (ret) { - goto fail; - } - } - DEBUG(6, ("Storing info for group %s\n", name)); ret = sdap_store_group_with_gid(ctx, |