diff options
-rw-r--r-- | src/db/sysdb_ops.c | 15 | ||||
-rw-r--r-- | src/db/sysdb_search.c | 24 | ||||
-rw-r--r-- | src/db/sysdb_upgrade.c | 9 | ||||
-rw-r--r-- | src/tools/sss_groupshow.c | 8 |
4 files changed, 18 insertions, 38 deletions
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 6085762dc..acdc8415b 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -423,8 +423,7 @@ int sysdb_search_user_by_uid(TALLOC_CTX *mem_ctx, return ENOMEM; } - basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + basedn = sysdb_user_base_dn(tmp_ctx, domain); if (!basedn) { ret = ENOMEM; goto done; @@ -494,8 +493,7 @@ int sysdb_search_user_by_upn(TALLOC_CTX *mem_ctx, return ENOMEM; } - basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + basedn = sysdb_user_base_dn(tmp_ctx, domain); if (basedn == NULL) { ret = ENOMEM; goto done; @@ -564,8 +562,7 @@ int sysdb_search_group_by_gid(TALLOC_CTX *mem_ctx, return ENOMEM; } - basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, domain->name); + basedn = sysdb_group_base_dn(tmp_ctx, domain); if (!basedn) { ret = ENOMEM; goto done; @@ -2629,8 +2626,7 @@ int sysdb_search_users(TALLOC_CTX *mem_ctx, return ENOMEM; } - basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + basedn = sysdb_user_base_dn(tmp_ctx, domain); if (!basedn) { DEBUG(SSSDBG_OP_FAILURE, "Failed to build base dn\n"); ret = ENOMEM; @@ -2791,8 +2787,7 @@ int sysdb_search_groups(TALLOC_CTX *mem_ctx, return ENOMEM; } - basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, domain->name); + basedn = sysdb_group_base_dn(tmp_ctx, domain); if (!basedn) { DEBUG(SSSDBG_OP_FAILURE, "Failed to build base dn\n"); ret = ENOMEM; diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c index 677257405..7acefcedd 100644 --- a/src/db/sysdb_search.c +++ b/src/db/sysdb_search.c @@ -46,8 +46,7 @@ int sysdb_getpwnam(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + base_dn = sysdb_user_base_dn(tmp_ctx, domain); if (!base_dn) { ret = ENOMEM; goto done; @@ -168,8 +167,7 @@ int sysdb_getpwuid(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + base_dn = sysdb_user_base_dn(tmp_ctx, domain); if (!base_dn) { ret = ENOMEM; goto done; @@ -272,8 +270,7 @@ int sysdb_enumpwent(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + base_dn = sysdb_user_base_dn(tmp_ctx, domain); if (!base_dn) { ret = ENOMEM; goto done; @@ -489,8 +486,7 @@ int sysdb_getgrnam(TALLOC_CTX *mem_ctx, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRNAM_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, domain->name); + base_dn = sysdb_group_base_dn(tmp_ctx, domain); } if (!base_dn) { ret = ENOMEM; @@ -640,8 +636,7 @@ int sysdb_getgrgid(TALLOC_CTX *mem_ctx, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRGID_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, domain->name); + base_dn = sysdb_group_base_dn(tmp_ctx, domain); } if (!base_dn) { ret = ENOMEM; @@ -689,8 +684,7 @@ int sysdb_enumgrent(TALLOC_CTX *mem_ctx, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRENT_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, domain->name); + base_dn = sysdb_group_base_dn(tmp_ctx, domain); } if (!base_dn) { ret = ENOMEM; @@ -998,8 +992,7 @@ int sysdb_get_user_attr(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + base_dn = sysdb_user_base_dn(tmp_ctx, domain); if (!base_dn) { ret = ENOMEM; goto done; @@ -1530,8 +1523,7 @@ errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, goto done; } - basedn = ldb_dn_new_fmt(tmp_ctx, sysdb_ctx_get_ldb(dom->sysdb), - SYSDB_TMPL_GROUP_BASE, dom->name); + basedn = sysdb_group_base_dn(tmp_ctx, dom); if (!basedn) { ret = ENOMEM; goto done; diff --git a/src/db/sysdb_upgrade.c b/src/db/sysdb_upgrade.c index 558b4f520..6cebc877b 100644 --- a/src/db/sysdb_upgrade.c +++ b/src/db/sysdb_upgrade.c @@ -443,14 +443,12 @@ int sysdb_check_upgrade_02(struct sss_domain_info *domains, goto done; } - users_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, - SYSDB_TMPL_USER_BASE, dom->name); + users_dn = sysdb_user_base_dn(tmp_ctx, dom); if (!users_dn) { ret = ENOMEM; goto done; } - groups_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, - SYSDB_TMPL_GROUP_BASE, dom->name); + groups_dn = sysdb_group_base_dn(tmp_ctx, dom); if (!groups_dn) { ret = ENOMEM; goto done; @@ -1047,8 +1045,7 @@ int sysdb_upgrade_10(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, return ret; } - basedn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, - SYSDB_TMPL_USER_BASE, domain->name); + basedn = sysdb_user_base_dn(tmp_ctx, domain); if (basedn == NULL) { ret = EIO; goto done; diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c index 251e71b15..41d7475ce 100644 --- a/src/tools/sss_groupshow.c +++ b/src/tools/sss_groupshow.c @@ -111,12 +111,8 @@ static int parse_members(TALLOC_CTX *mem_ctx, goto fail; } - user_basedn = ldb_dn_new_fmt(tmp_ctx, ldb, - SYSDB_TMPL_USER_BASE, - domain->name); - group_basedn = ldb_dn_new_fmt(tmp_ctx, ldb, - SYSDB_TMPL_GROUP_BASE, - domain->name); + user_basedn = sysdb_user_base_dn(tmp_ctx, domain); + group_basedn = sysdb_group_base_dn(tmp_ctx, domain); if (!user_basedn || !group_basedn) { ret = ENOMEM; goto fail; |