summaryrefslogtreecommitdiff
path: root/server/responder/common
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2009-08-05 06:51:07 -0400
committerStephen Gallagher <sgallagh@redhat.com>2009-08-10 09:42:19 -0400
commit0c7050d8569ce7ee61b13d02b4733249a11e171f (patch)
treeab51d15a42dd2049d5a55eed8dbd79945e119050 /server/responder/common
parent2b0f40eaba44742fa38bb5b67ada510e7b2b6324 (diff)
downloadsssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.gz
sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.bz2
sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.zip
Cosmetic changes
Rationalize and rename connection names in preparatoin for merging of server and connection structures.
Diffstat (limited to 'server/responder/common')
-rw-r--r--server/responder/common/responder.h2
-rw-r--r--server/responder/common/responder_common.c4
-rw-r--r--server/responder/common/responder_dp.c20
3 files changed, 13 insertions, 13 deletions
diff --git a/server/responder/common/responder.h b/server/responder/common/responder.h
index 408ee4da..5bde42ac 100644
--- a/server/responder/common/responder.h
+++ b/server/responder/common/responder.h
@@ -64,7 +64,7 @@ struct resp_ctx {
const char *sock_name;
const char *priv_sock_name;
- struct sbus_conn_ctx *conn_ctx;
+ struct sbus_connection *conn;
struct sbus_method_ctx *sm_ctx;
struct sss_domain_info *domains;
diff --git a/server/responder/common/responder_common.c b/server/responder/common/responder_common.c
index f8744b67..1fd66907 100644
--- a/server/responder/common/responder_common.c
+++ b/server/responder/common/responder_common.c
@@ -311,7 +311,7 @@ static int sss_sbus_init(struct resp_ctx *rctx)
}
ret = sbus_client_init(rctx, rctx->ev, rctx->sm_ctx,
- sbus_address, &rctx->conn_ctx,
+ sbus_address, &rctx->conn,
NULL, NULL);
if (ret != EOK) {
DEBUG(0, ("Failed to connect to monitor services.\n"));
@@ -497,7 +497,7 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
DEBUG(0, ("fatal error setting up backend connector\n"));
return ret;
}
- else if (!rctx->conn_ctx) {
+ else if (!rctx->conn) {
DEBUG(0, ("Data Provider is not yet available. Retrying.\n"));
return EIO;
}
diff --git a/server/responder/common/responder_dp.c b/server/responder/common/responder_dp.c
index 9083a173..bdd9a9ef 100644
--- a/server/responder/common/responder_dp.c
+++ b/server/responder/common/responder_dp.c
@@ -62,7 +62,7 @@ static void sss_dp_conn_reconnect(struct sss_dp_pvt_ctx *pvt)
}
ret = sbus_client_init(rctx, rctx->ev, rctx->sm_ctx,
- sbus_address, &rctx->conn_ctx,
+ sbus_address, &rctx->conn,
sss_dp_conn_destructor, pvt);
if (ret != EOK) {
DEBUG(4, ("Failed to reconnect [%d(%s)]!\n", ret, strerror(ret)));
@@ -92,15 +92,15 @@ static void sss_dp_reconnect(struct tevent_context *ev,
int sss_dp_conn_destructor(void *data)
{
struct sss_dp_pvt_ctx *pvt;
- struct sbus_conn_ctx *scon;
+ struct sbus_connection *conn;
- scon = talloc_get_type(data, struct sbus_conn_ctx);
- if (!scon) return 0;
+ conn = talloc_get_type(data, struct sbus_connection);
+ if (!conn) return 0;
/* if this is a regular disconnect just quit */
- if (sbus_conn_disconnecting(scon)) return 0;
+ if (sbus_conn_disconnecting(conn)) return 0;
- pvt = talloc_get_type(sbus_conn_get_private_data(scon),
+ pvt = talloc_get_type(sbus_conn_get_private_data(conn),
struct sss_dp_pvt_ctx);
if (pvt) return 0;
@@ -198,7 +198,7 @@ int nss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx,
struct nss_dp_req *ndp_req;
DBusMessage *msg;
DBusPendingCall *pending_reply;
- DBusConnection *conn;
+ DBusConnection *dbus_conn;
dbus_bool_t ret;
uint32_t be_type;
const char *attrs = "core";
@@ -243,12 +243,12 @@ int nss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx,
* in some pathological cases it may happen that nss starts up before
* dp connection code is actually able to establish a connection.
*/
- if (!rctx->conn_ctx) {
+ if (!rctx->conn) {
DEBUG(1, ("The Data Provider connection is not available yet!"
" This maybe a bug, it shouldn't happen!\n"));
return EIO;
}
- conn = sbus_get_connection(rctx->conn_ctx);
+ dbus_conn = sbus_get_connection(rctx->conn);
/* create the message */
msg = dbus_message_new_method_call(NULL,
@@ -274,7 +274,7 @@ int nss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx,
return EIO;
}
- ret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
+ ret = dbus_connection_send_with_reply(dbus_conn, msg, &pending_reply,
600000 /* TODO: set timeout */);
if (!ret || pending_reply == NULL) {
/*