diff options
Diffstat (limited to 'server/responder/nss/nsssrv.c')
| -rw-r--r-- | server/responder/nss/nsssrv.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/server/responder/nss/nsssrv.c b/server/responder/nss/nsssrv.c index 419ed1de..d104c7c8 100644 --- a/server/responder/nss/nsssrv.c +++ b/server/responder/nss/nsssrv.c @@ -52,10 +52,10 @@ #define SSS_NSS_PIPE_NAME "nss" -static int service_identity(DBusMessage *message, struct sbus_conn_ctx *sconn); -static int service_pong(DBusMessage *message, struct sbus_conn_ctx *sconn); -static int service_reload(DBusMessage *message, struct sbus_conn_ctx *sconn); -static int service_res_init(DBusMessage *message, struct sbus_conn_ctx *sconn); +static int service_identity(DBusMessage *message, struct sbus_connection *conn); +static int service_pong(DBusMessage *message, struct sbus_connection *conn); +static int service_reload(DBusMessage *message, struct sbus_connection *conn); +static int service_res_init(DBusMessage *message, struct sbus_connection *conn); struct sbus_method nss_sbus_methods[] = { {SERVICE_METHOD_IDENTITY, service_identity}, @@ -65,7 +65,7 @@ struct sbus_method nss_sbus_methods[] = { {NULL, NULL} }; -static int service_identity(DBusMessage *message, struct sbus_conn_ctx *sconn) +static int service_identity(DBusMessage *message, struct sbus_connection *conn) { dbus_uint16_t version = NSS_SBUS_SERVICE_VERSION; const char *name = NSS_SBUS_SERVICE_NAME; @@ -88,13 +88,13 @@ static int service_identity(DBusMessage *message, struct sbus_conn_ctx *sconn) } /* send reply back */ - sbus_conn_send_reply(sconn, reply); + sbus_conn_send_reply(conn, reply); dbus_message_unref(reply); return EOK; } -static int service_pong(DBusMessage *message, struct sbus_conn_ctx *sconn) +static int service_pong(DBusMessage *message, struct sbus_connection *conn) { DBusMessage *reply; dbus_bool_t ret; @@ -109,13 +109,13 @@ static int service_pong(DBusMessage *message, struct sbus_conn_ctx *sconn) } /* send reply back */ - sbus_conn_send_reply(sconn, reply); + sbus_conn_send_reply(conn, reply); dbus_message_unref(reply); return EOK; } -static int service_reload(DBusMessage *message, struct sbus_conn_ctx *sconn) +static int service_reload(DBusMessage *message, struct sbus_connection *conn) { /* Monitor calls this function when we need to reload * our configuration information. Perform whatever steps @@ -123,10 +123,10 @@ static int service_reload(DBusMessage *message, struct sbus_conn_ctx *sconn) */ /* Send an empty reply to acknowledge receipt */ - return service_pong(message, sconn); + return service_pong(message, conn); } -static int service_res_init(DBusMessage *message, struct sbus_conn_ctx *sconn) +static int service_res_init(DBusMessage *message, struct sbus_connection *conn) { int ret; @@ -135,7 +135,7 @@ static int service_res_init(DBusMessage *message, struct sbus_conn_ctx *sconn) return EIO; } - return service_pong(message, sconn); + return service_pong(message, conn); } static int nss_get_config(struct nss_ctx *nctx, @@ -250,7 +250,7 @@ static void nss_shutdown(struct resp_ctx *rctx) } -static void nss_dp_reconnect_init(struct sbus_conn_ctx *sconn, int status, void *pvt) +static void nss_dp_reconnect_init(struct sbus_connection *conn, int status, void *pvt) { int ret; struct resp_ctx *rctx = talloc_get_type(pvt, struct resp_ctx); @@ -258,7 +258,7 @@ static void nss_dp_reconnect_init(struct sbus_conn_ctx *sconn, int status, void /* Did we reconnect successfully? */ if (status == SBUS_RECONNECT_SUCCESS) { /* Add the methods back to the new connection */ - ret = sbus_conn_add_method_ctx(rctx->conn_ctx, + ret = sbus_conn_add_method_ctx(rctx->conn, rctx->sm_ctx); if (ret != EOK) { DEBUG(0, ("Could not re-add methods on reconnection.\n")); @@ -327,7 +327,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx, return ret; } - sbus_reconnect_init(nctx->rctx->conn_ctx, + sbus_reconnect_init(nctx->rctx->conn, max_retries, nss_dp_reconnect_init, nctx->rctx); |