summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2014-07-08 11:43:04 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-09-01 13:56:57 +0200
commit17c4d901ecf62fa9d641d46c9e92032b0deaaa36 (patch)
tree5e4afcbf3d7496f7771328e0f416ebacead59ce6 /src
parentcda952ca3e00d324c7e53eeaeda394eb0d142818 (diff)
downloadsssd-17c4d901ecf62fa9d641d46c9e92032b0deaaa36.tar.gz
sssd-17c4d901ecf62fa9d641d46c9e92032b0deaaa36.tar.xz
sssd-17c4d901ecf62fa9d641d46c9e92032b0deaaa36.zip
PAM: remove ldb_result member from pam_auth_req context
This member was used only in a single call where a local variable suits better.
Diffstat (limited to 'src')
-rw-r--r--src/responder/pam/pamsrv.h1
-rw-r--r--src/responder/pam/pamsrv_cmd.c11
2 files changed, 6 insertions, 6 deletions
diff --git a/src/responder/pam/pamsrv.h b/src/responder/pam/pamsrv.h
index 129419b56..1e37a77a1 100644
--- a/src/responder/pam/pamsrv.h
+++ b/src/responder/pam/pamsrv.h
@@ -51,7 +51,6 @@ struct pam_auth_req {
pam_dp_callback_t *callback;
- struct ldb_result *res;
bool check_provider;
void *data;
diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c
index 46a44e055..eae17341a 100644
--- a/src/responder/pam/pamsrv_cmd.c
+++ b/src/responder/pam/pamsrv_cmd.c
@@ -916,6 +916,7 @@ static int pam_check_user_search(struct pam_auth_req *preq)
struct dp_callback_ctx *cb_ctx;
struct pam_ctx *pctx =
talloc_get_type(preq->cctx->rctx->pvt_ctx, struct pam_ctx);
+ struct ldb_result *res;
while (dom) {
/* if it is a domainless search, skip domains that require fully
@@ -978,20 +979,20 @@ static int pam_check_user_search(struct pam_auth_req *preq)
return EFAULT;
}
- ret = sysdb_getpwnam(preq, dom, name, &preq->res);
+ ret = sysdb_getpwnam(preq, dom, name, &res);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE,
"Failed to make request to our cache!\n");
return EIO;
}
- if (preq->res->count > 1) {
+ if (res->count > 1) {
DEBUG(SSSDBG_FATAL_FAILURE,
"getpwnam call returned more than one result !?!\n");
return ENOENT;
}
- if (preq->res->count == 0) {
+ if (res->count == 0) {
if (preq->check_provider == false) {
/* set negative cache only if not result of cache check */
ret = sss_ncache_set_user(pctx->ncache, false, dom, name);
@@ -1020,7 +1021,7 @@ static int pam_check_user_search(struct pam_auth_req *preq)
/* if we need to check the remote account go on */
if (preq->check_provider) {
- cacheExpire = ldb_msg_find_attr_as_uint64(preq->res->msgs[0],
+ cacheExpire = ldb_msg_find_attr_as_uint64(res->msgs[0],
SYSDB_CACHE_EXPIRE, 0);
if (cacheExpire < time(NULL)) {
break;
@@ -1031,7 +1032,7 @@ static int pam_check_user_search(struct pam_auth_req *preq)
"Returning info for user [%s@%s]\n", name, dom->name);
/* We might have searched by alias. Pass on the primary name */
- ret = pd_set_primary_name(preq->res->msgs[0], preq->pd);
+ ret = pd_set_primary_name(res->msgs[0], preq->pd);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE, "Could not canonicalize username\n");
return ret;