diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-07-31 09:52:14 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-08-10 09:42:18 -0400 |
| commit | 2b0f40eaba44742fa38bb5b67ada510e7b2b6324 (patch) | |
| tree | 10317ab1e5428020e0363c45a3e943141a14e519 /server/responder/pam | |
| parent | 508b5b2a360c9530c6ea67a7b7ed6d61559846e4 (diff) | |
| download | sssd-2b0f40eaba44742fa38bb5b67ada510e7b2b6324.tar.gz sssd-2b0f40eaba44742fa38bb5b67ada510e7b2b6324.tar.xz sssd-2b0f40eaba44742fa38bb5b67ada510e7b2b6324.zip | |
Remove redundant memory contexts
Simplify code by removing stuff that is never used or redundant.
Diffstat (limited to 'server/responder/pam')
| -rw-r--r-- | server/responder/pam/pamsrv.c | 6 | ||||
| -rw-r--r-- | server/responder/pam/pamsrv_dp.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/responder/pam/pamsrv.c b/server/responder/pam/pamsrv.c index ef01e9729..05e3a12d6 100644 --- a/server/responder/pam/pamsrv.c +++ b/server/responder/pam/pamsrv.c @@ -148,8 +148,8 @@ 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->dp_ctx->scon_ctx, - rctx->dp_ctx->sm_ctx); + ret = sbus_conn_add_method_ctx(rctx->conn_ctx, + rctx->sm_ctx); if (ret != EOK) { DEBUG(0, ("Could not re-add methods on reconnection.\n")); pam_shutdown(rctx); @@ -190,7 +190,7 @@ static int pam_process_init(struct main_context *main_ctx, return ret; } - sbus_reconnect_init(rctx->dp_ctx->scon_ctx, max_retries, + sbus_reconnect_init(rctx->conn_ctx, max_retries, pam_dp_reconnect_init, rctx); return EOK; diff --git a/server/responder/pam/pamsrv_dp.c b/server/responder/pam/pamsrv_dp.c index 1de434782..9703fdbbb 100644 --- a/server/responder/pam/pamsrv_dp.c +++ b/server/responder/pam/pamsrv_dp.c @@ -92,12 +92,12 @@ int pam_dp_send_req(struct pam_auth_req *preq, int timeout) * in some pathological cases it may happen that nss starts up before * dp connection code is actually able to establish a connection. */ - if (!preq->cctx->rctx->dp_ctx) { + if (!preq->cctx->rctx->conn_ctx) { 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(preq->cctx->rctx->dp_ctx->scon_ctx); + conn = sbus_get_connection(preq->cctx->rctx->conn_ctx); msg = dbus_message_new_method_call(NULL, DP_CLI_PATH, |