diff options
author | Simo Sorce <ssorce@redhat.com> | 2009-08-05 06:51:07 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-08-10 09:42:19 -0400 |
commit | 0c7050d8569ce7ee61b13d02b4733249a11e171f (patch) | |
tree | ab51d15a42dd2049d5a55eed8dbd79945e119050 /server/responder/pam/pamsrv.c | |
parent | 2b0f40eaba44742fa38bb5b67ada510e7b2b6324 (diff) | |
download | sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.gz sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.xz sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.zip |
Cosmetic changes
Rationalize and rename connection names in preparatoin for merging of server and
connection structures.
Diffstat (limited to 'server/responder/pam/pamsrv.c')
-rw-r--r-- | server/responder/pam/pamsrv.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/server/responder/pam/pamsrv.c b/server/responder/pam/pamsrv.c index 05e3a12d6..cd423714c 100644 --- a/server/responder/pam/pamsrv.c +++ b/server/responder/pam/pamsrv.c @@ -55,10 +55,10 @@ #define PAM_SBUS_SERVICE_NAME "pam" #define PAM_SRV_CONFIG "config/services/pam" -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 sss_sbus_methods[] = { {SERVICE_METHOD_IDENTITY, service_identity}, @@ -68,7 +68,7 @@ struct sbus_method sss_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 = PAM_SBUS_SERVICE_VERSION; const char *name = PAM_SBUS_SERVICE_NAME; @@ -90,13 +90,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; @@ -110,13 +110,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_res_init(DBusMessage *message, struct sbus_conn_ctx *sconn) +static int service_res_init(DBusMessage *message, struct sbus_connection *conn) { int ret; @@ -125,22 +125,22 @@ 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 void pam_shutdown(struct resp_ctx *ctx); -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 * are needed to update the configuration objects. */ /* Send an empty reply to acknowledge receipt */ - return service_pong(message, sconn); + return service_pong(message, conn); } -static void pam_dp_reconnect_init(struct sbus_conn_ctx *sconn, int status, void *pvt) +static void pam_dp_reconnect_init(struct sbus_connection *conn, int status, void *pvt) { int ret; struct resp_ctx *rctx = talloc_get_type(pvt, struct resp_ctx); @@ -148,7 +148,7 @@ static void pam_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")); @@ -190,7 +190,7 @@ static int pam_process_init(struct main_context *main_ctx, return ret; } - sbus_reconnect_init(rctx->conn_ctx, max_retries, + sbus_reconnect_init(rctx->conn, max_retries, pam_dp_reconnect_init, rctx); return EOK; |