diff options
Diffstat (limited to 'src/responder')
-rw-r--r-- | src/responder/nss/nsssrv_cmd.c | 14 | ||||
-rw-r--r-- | src/responder/nss/nsssrv_netgroup.c | 3 | ||||
-rw-r--r-- | src/responder/pam/pam_LOCAL_domain.c | 6 | ||||
-rw-r--r-- | src/responder/pam/pamsrv_cmd.c | 10 |
4 files changed, 13 insertions, 20 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 56ebe4815..8f4cb4401 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -744,7 +744,7 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) return EIO; } - ret = sysdb_getpwnam(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_getpwnam(cmdctx, sysdb, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -966,7 +966,7 @@ static int nss_cmd_getpwuid_search(struct nss_dom_ctx *dctx) return EIO; } - ret = sysdb_getpwuid(cmdctx, sysdb, dom, cmdctx->id, &dctx->res); + ret = sysdb_getpwuid(cmdctx, sysdb, cmdctx->id, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -1355,7 +1355,7 @@ static errno_t nss_cmd_setpwent_step(struct setent_step_ctx *step_ctx) } } - ret = sysdb_enumpwent(dctx, sysdb, dctx->domain, &res); + ret = sysdb_enumpwent(dctx, sysdb, &res); if (ret != EOK) { DEBUG(1, ("Enum from cache failed, skipping domain [%s]\n", dom->name)); @@ -2011,7 +2011,7 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) return EIO; } - ret = sysdb_getgrnam(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_getgrnam(cmdctx, sysdb, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -2233,7 +2233,7 @@ static int nss_cmd_getgrgid_search(struct nss_dom_ctx *dctx) return EIO; } - ret = sysdb_getgrgid(cmdctx, sysdb, dom, cmdctx->id, &dctx->res); + ret = sysdb_getgrgid(cmdctx, sysdb, cmdctx->id, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -2615,7 +2615,7 @@ static errno_t nss_cmd_setgrent_step(struct setent_step_ctx *step_ctx) } } - ret = sysdb_enumgrent(dctx, sysdb, dctx->domain, &res); + ret = sysdb_enumgrent(dctx, sysdb, &res); if (ret != EOK) { DEBUG(1, ("Enum from cache failed, skipping domain [%s]\n", dom->name)); @@ -3059,7 +3059,7 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) return EIO; } - ret = sysdb_initgroups(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_initgroups(cmdctx, sysdb, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache! [%d][%s]\n", ret, strerror(ret))); diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c index df3823ed2..cd0ba723a 100644 --- a/src/responder/nss/nsssrv_netgroup.c +++ b/src/responder/nss/nsssrv_netgroup.c @@ -402,8 +402,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) } /* Look up the netgroup in the cache */ - ret = sysdb_getnetgr(step_ctx->dctx, sysdb, dom, - step_ctx->name, + ret = sysdb_getnetgr(step_ctx->dctx, sysdb, step_ctx->name, &step_ctx->dctx->res); if (ret == ENOENT) { /* This netgroup was not found in this domain */ diff --git a/src/responder/pam/pam_LOCAL_domain.c b/src/responder/pam/pam_LOCAL_domain.c index 6e0631aa8..d636fd33b 100644 --- a/src/responder/pam/pam_LOCAL_domain.c +++ b/src/responder/pam/pam_LOCAL_domain.c @@ -87,7 +87,6 @@ static void do_successful_login(struct LOCAL_request *lreq) lreq->error, ret, done); ret = sysdb_set_user_attr(lreq, lreq->dbctx, - lreq->preq->domain, lreq->preq->pd->user, lreq->mod_attrs, SYSDB_MOD_REP); NEQ_CHECK_OR_JUMP(ret, EOK, ("sysdb_set_user_attr failed.\n"), @@ -129,7 +128,6 @@ static void do_failed_login(struct LOCAL_request *lreq) lreq->error, ret, done); ret = sysdb_set_user_attr(lreq, lreq->dbctx, - lreq->preq->domain, lreq->preq->pd->user, lreq->mod_attrs, SYSDB_MOD_REP); NEQ_CHECK_OR_JUMP(ret, EOK, ("sysdb_set_user_attr failed.\n"), @@ -203,7 +201,6 @@ static void do_pam_chauthtok(struct LOCAL_request *lreq) lreq->error, ret, done); ret = sysdb_set_user_attr(lreq, lreq->dbctx, - lreq->preq->domain, lreq->preq->pd->user, lreq->mod_attrs, SYSDB_MOD_REP); NEQ_CHECK_OR_JUMP(ret, EOK, ("sysdb_set_user_attr failed.\n"), @@ -254,8 +251,7 @@ 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, + ret = sysdb_get_user_attr(lreq, lreq->dbctx, preq->pd->user, attrs, &res); if (ret != EOK) { DEBUG(1, ("sysdb_get_user_attr failed.\n")); diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 3c9d7600a..48228e97f 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -310,9 +310,8 @@ static errno_t set_last_login(struct pam_auth_req *preq) goto fail; } - ret = sysdb_set_user_attr(preq, dbctx, - preq->domain, preq->pd->user, - attrs, SYSDB_MOD_REP); + ret = sysdb_set_user_attr(preq, dbctx, preq->pd->user, attrs, + SYSDB_MOD_REP); if (ret != EOK) { DEBUG(2, ("set_last_login failed.\n")); preq->pd->pam_status = PAM_SYSTEM_ERR; @@ -485,8 +484,7 @@ static void pam_reply(struct pam_auth_req *preq) goto done; } - ret = sysdb_cache_auth(preq, sysdb, - preq->domain, pd->user, + ret = sysdb_cache_auth(preq, sysdb, pd->user, pd->authtok, pd->authtok_size, pctx->rctx->cdb, false, &exp_date, &delay_until); @@ -849,7 +847,7 @@ static int pam_check_user_search(struct pam_auth_req *preq) preq->pd->pam_status = PAM_SYSTEM_ERR; return EFAULT; } - ret = sysdb_getpwnam(preq, sysdb, dom, name, &preq->res); + ret = sysdb_getpwnam(preq, sysdb, name, &preq->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; |