From f1e4471551aa74015579bff0b64735cc9b085b74 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 5 Aug 2009 05:44:20 -0400 Subject: merge server and connection structures This reduce code duplication as it allows to use one set of watch and timeout functions, and at the same time also allow not to use a secondary structure just to unify these functions. --- server/responder/common/responder_common.c | 4 ++-- server/responder/common/responder_dp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/responder/common') diff --git a/server/responder/common/responder_common.c b/server/responder/common/responder_common.c index 1fd669071..c8e5d8181 100644 --- a/server/responder/common/responder_common.c +++ b/server/responder/common/responder_common.c @@ -310,8 +310,8 @@ static int sss_sbus_init(struct resp_ctx *rctx) return ENOMEM; } - ret = sbus_client_init(rctx, rctx->ev, rctx->sm_ctx, - sbus_address, &rctx->conn, + ret = sbus_client_init(rctx, rctx->ev, sbus_address, + rctx->sm_ctx, &rctx->conn, NULL, NULL); if (ret != EOK) { DEBUG(0, ("Failed to connect to monitor services.\n")); diff --git a/server/responder/common/responder_dp.c b/server/responder/common/responder_dp.c index bdd9a9efc..547cb2729 100644 --- a/server/responder/common/responder_dp.c +++ b/server/responder/common/responder_dp.c @@ -61,8 +61,8 @@ static void sss_dp_conn_reconnect(struct sss_dp_pvt_ctx *pvt) return; } - ret = sbus_client_init(rctx, rctx->ev, rctx->sm_ctx, - sbus_address, &rctx->conn, + ret = sbus_client_init(rctx, rctx->ev, sbus_address, + rctx->sm_ctx, &rctx->conn, sss_dp_conn_destructor, pvt); if (ret != EOK) { DEBUG(4, ("Failed to reconnect [%d(%s)]!\n", ret, strerror(ret))); -- cgit