From 95f5e7963a36b7b68859ce91ae4b232088bbaa09 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Fri, 21 Sep 2012 23:41:42 +0200
Subject: SYSDB: Remove unnecessary domain parameter from several sysdb calls

The domain can be read from the sysdb object. Removing the domain string
makes the API more self-contained.
---
 src/providers/ipa/ipa_access.c            | 1 -
 src/providers/ipa/ipa_hbac_common.c       | 8 +++-----
 src/providers/ipa/ipa_selinux.c           | 5 +----
 src/providers/ldap/sdap_async_groups.c    | 2 +-
 src/providers/ldap/sdap_async_netgroups.c | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/providers')

diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index d3fb158f0..5c97575fc 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -501,7 +501,6 @@ static void hbac_sysdb_save(struct tevent_req *req)
          * are also denied.
          */
         base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx,
-                                          domain->name,
                                           HBAC_RULES_SUBDIR);
         if (base_dn == NULL) {
             talloc_free(tmp_ctx);
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
index 341b56223..54628d80b 100644
--- a/src/providers/ipa/ipa_hbac_common.c
+++ b/src/providers/ipa/ipa_hbac_common.c
@@ -44,7 +44,7 @@ ipa_hbac_save_list(struct sysdb_ctx *sysdb, bool delete_subdir,
     }
 
     if (delete_subdir) {
-        base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx, domain->name, subdir);
+        base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx, subdir);
         if (base_dn == NULL) {
             ret = ENOMEM;
             goto done;
@@ -617,8 +617,7 @@ hbac_eval_service_element(TALLOC_CTX *mem_ctx,
 
     svc->name = servicename;
 
-    svc_dn = sysdb_custom_dn(sysdb, tmp_ctx, domain->name,
-                             svc->name, HBAC_SERVICES_SUBDIR);
+    svc_dn = sysdb_custom_dn(sysdb, tmp_ctx, svc->name, HBAC_SERVICES_SUBDIR);
     if (svc_dn == NULL) {
         ret = ENOMEM;
         goto done;
@@ -725,8 +724,7 @@ hbac_eval_host_element(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    host_dn = sysdb_custom_dn(sysdb, tmp_ctx, domain->name,
-                              host->name, HBAC_HOSTS_SUBDIR);
+    host_dn = sysdb_custom_dn(sysdb, tmp_ctx, host->name, HBAC_HOSTS_SUBDIR);
     if (host_dn == NULL) {
         ret = ENOMEM;
         goto done;
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
index 0adc0fd02..b64de90b1 100644
--- a/src/providers/ipa/ipa_selinux.c
+++ b/src/providers/ipa/ipa_selinux.c
@@ -255,7 +255,6 @@ static void ipa_get_selinux_connect_done(struct tevent_req *subreq)
     size_t count;
     struct ldb_message **msgs;
     struct sysdb_attrs **hosts;
-    struct sss_domain_info *domain;
 
     ret = sdap_id_op_connect_recv(subreq, &dp_error);
     talloc_zfree(subreq);
@@ -275,9 +274,7 @@ static void ipa_get_selinux_connect_done(struct tevent_req *subreq)
     access_name = state->be_req->be_ctx->bet_info[BET_ACCESS].mod_name;
     selinux_name = state->be_req->be_ctx->bet_info[BET_SELINUX].mod_name;
     if (strcasecmp(access_name, selinux_name) == 0) {
-        domain = sysdb_ctx_get_domain(bctx->sysdb);
-        host_dn = sysdb_custom_dn(bctx->sysdb, state, domain->name,
-                                  state->hostname, HBAC_HOSTS_SUBDIR);
+        host_dn = sysdb_custom_dn(bctx->sysdb, state, state->hostname, HBAC_HOSTS_SUBDIR);
         if (host_dn == NULL) {
             ret = ENOMEM;
             goto fail;
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index ac5057e8c..525de6749 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -61,7 +61,7 @@ static int sdap_find_entry_by_origDN(TALLOC_CTX *memctx,
         goto done;
     }
 
-    base_dn = sysdb_domain_dn(ctx, tmpctx, domain->name);
+    base_dn = sysdb_domain_dn(ctx, tmpctx);
     if (!base_dn) {
         ret = ENOMEM;
         goto done;
diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c
index 2262db51c..12715d491 100644
--- a/src/providers/ldap/sdap_async_netgroups.c
+++ b/src/providers/ldap/sdap_async_netgroups.c
@@ -324,7 +324,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx,
         goto fail;
     }
 
-    netgr_basedn = sysdb_netgroup_base_dn(sysdb, state, dom->name);
+    netgr_basedn = sysdb_netgroup_base_dn(sysdb, state);
     if (netgr_basedn == NULL) {
         ret = ENOMEM;
         goto fail;
-- 
cgit