From b3292840ebaa747a9fd596ff47cc5d18198361d0 Mon Sep 17 00:00:00 2001 From: Michal Zidek Date: Tue, 8 Oct 2013 15:13:58 +0200 Subject: SYSDB: Drop the sysdb_ctx parameter from the sysdb_search module --- src/responder/pam/pam_LOCAL_domain.c | 4 ++-- src/responder/pam/pamsrv_cmd.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/responder/pam') diff --git a/src/responder/pam/pam_LOCAL_domain.c b/src/responder/pam/pam_LOCAL_domain.c index e7776cba3..4c2de626d 100644 --- a/src/responder/pam/pam_LOCAL_domain.c +++ b/src/responder/pam/pam_LOCAL_domain.c @@ -248,8 +248,8 @@ int LOCAL_pam_handler(struct pam_auth_req *preq) pd->pam_status = PAM_SUCCESS; - ret = sysdb_get_user_attr(lreq, lreq->dbctx, preq->domain, - preq->pd->user, attrs, &res); + ret = sysdb_get_user_attr(lreq, preq->domain, preq->pd->user, attrs, + &res); if (ret != EOK) { DEBUG(1, ("sysdb_get_user_attr failed.\n")); talloc_free(lreq); diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 32efc4ba8..006c3e227 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -903,7 +903,6 @@ static int pam_check_user_search(struct pam_auth_req *preq) { struct sss_domain_info *dom = preq->domain; char *name = NULL; - struct sysdb_ctx *sysdb; time_t cacheExpire; int ret; struct tevent_req *dpreq; @@ -956,14 +955,13 @@ static int pam_check_user_search(struct pam_auth_req *preq) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); preq->pd->pam_status = PAM_SYSTEM_ERR; return EFAULT; } - ret = sysdb_getpwnam(preq, sysdb, dom, name, &preq->res); + ret = sysdb_getpwnam(preq, dom, name, &preq->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; -- cgit