From d34961fdcf5a999d9debee3d1d8e255457798295 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 9 Jan 2013 16:45:57 -0500
Subject: Remove sysdb argument from ipa_host_info_send()
---
src/providers/ipa/ipa_access.c | 1 -
src/providers/ipa/ipa_hostid.c | 6 ++----
src/providers/ipa/ipa_hosts.c | 2 --
src/providers/ipa/ipa_hosts.h | 1 -
src/providers/ipa/ipa_selinux.c | 2 +-
5 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index b8be19eb..ca9ea277 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -341,7 +341,6 @@ static int hbac_get_host_info_step(struct hbac_ctx *hbac_ctx)
req = ipa_host_info_send(hbac_ctx,
hbac_ctx_ev(hbac_ctx),
- hbac_ctx_sysdb(hbac_ctx),
sdap_id_op_handle(hbac_ctx->sdap_op),
hbac_ctx_sdap_id_ctx(hbac_ctx)->opts,
hostname,
diff --git a/src/providers/ipa/ipa_hostid.c b/src/providers/ipa/ipa_hostid.c
index a943cdb0..b60876cb 100644
--- a/src/providers/ipa/ipa_hostid.c
+++ b/src/providers/ipa/ipa_hostid.c
@@ -30,7 +30,6 @@ struct hosts_get_state {
struct tevent_context *ev;
struct ipa_hostid_ctx *ctx;
struct sdap_id_op *op;
- struct sysdb_ctx *sysdb;
struct sss_domain_info *domain;
const char *name;
const char *alias;
@@ -171,7 +170,6 @@ hosts_get_send(TALLOC_CTX *memctx,
goto fail;
}
- state->sysdb = ctx->be->domain->sysdb;
state->domain = ctx->be->domain;
state->name = name;
state->alias = alias;
@@ -225,7 +223,7 @@ hosts_get_connect_done(struct tevent_req *subreq)
return;
}
- subreq = ipa_host_info_send(state, state->ev, state->sysdb,
+ subreq = ipa_host_info_send(state, state->ev,
sdap_id_op_handle(state->op),
state->ctx->sdap_id_ctx->opts, state->name,
state->ctx->ipa_opts->host_map, NULL,
@@ -294,7 +292,7 @@ hosts_get_done(struct tevent_req *subreq)
goto done;
}
- ret = sysdb_store_ssh_host(state->sysdb, state->domain,
+ ret = sysdb_store_ssh_host(state->domain->sysdb, state->domain,
state->name, state->alias, now,
attrs);
if (ret != EOK) {
diff --git a/src/providers/ipa/ipa_hosts.c b/src/providers/ipa/ipa_hosts.c
index 792af410..286e5e9a 100644
--- a/src/providers/ipa/ipa_hosts.c
+++ b/src/providers/ipa/ipa_hosts.c
@@ -74,7 +74,6 @@ ipa_hostgroup_info_next(struct tevent_req *req,
struct tevent_req *
ipa_host_info_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
struct sdap_handle *sh,
struct sdap_options *opts,
const char *hostname,
@@ -92,7 +91,6 @@ ipa_host_info_send(TALLOC_CTX *mem_ctx,
}
state->ev = ev;
- state->sysdb = sysdb;
state->sh = sh;
state->opts = opts;
state->hostname = hostname;
diff --git a/src/providers/ipa/ipa_hosts.h b/src/providers/ipa/ipa_hosts.h
index 34ceec90..a1ea7a22 100644
--- a/src/providers/ipa/ipa_hosts.h
+++ b/src/providers/ipa/ipa_hosts.h
@@ -26,7 +26,6 @@
struct tevent_req *
ipa_host_info_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
- struct sysdb_ctx *sysdb,
struct sdap_handle *sh,
struct sdap_options *opts,
const char *hostname,
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
index 2711486e..bec4948f 100644
--- a/src/providers/ipa/ipa_selinux.c
+++ b/src/providers/ipa/ipa_selinux.c
@@ -554,7 +554,7 @@ static void ipa_get_selinux_connect_done(struct tevent_req *subreq)
goto fail;
}
- subreq = ipa_host_info_send(state, bctx->ev, bctx->domain->sysdb,
+ subreq = ipa_host_info_send(state, bctx->ev,
sdap_id_op_handle(state->op),
id_ctx->sdap_id_ctx->opts,
hostname,
--
cgit