diff options
author | Michal Zidek <mzidek@redhat.com> | 2013-10-17 14:17:56 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-11-15 20:20:19 +0100 |
commit | d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb (patch) | |
tree | c0809b3f8bb0a42186c8d07a65e66800b837c313 /src/providers/proxy | |
parent | 6a31a971a376a992afb838fe60b311360c970267 (diff) | |
download | sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.tar.gz sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.tar.xz sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.zip |
SYSDB: Drop the sysdb_ctx parameter - module sysdb_ops (part 2)
Diffstat (limited to 'src/providers/proxy')
-rw-r--r-- | src/providers/proxy/proxy_auth.c | 3 | ||||
-rw-r--r-- | src/providers/proxy/proxy_id.c | 10 | ||||
-rw-r--r-- | src/providers/proxy/proxy_netgroup.c | 16 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c index 61fec63aa..fa766dc4e 100644 --- a/src/providers/proxy/proxy_auth.c +++ b/src/providers/proxy/proxy_auth.c @@ -757,8 +757,7 @@ static void proxy_child_done(struct tevent_req *req) goto done; } - ret = sysdb_cache_password(be_ctx->domain->sysdb, be_ctx->domain, - pd->user, password); + ret = sysdb_cache_password(be_ctx->domain, pd->user, password); /* password caching failures are not fatal errors */ /* so we just log it any return */ diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 998b161db..503e325a4 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -209,7 +209,7 @@ delete_user(struct sysdb_ctx *sysdb, DEBUG(SSSDBG_TRACE_FUNC, ("User %s does not exist (or is invalid) on remote server," " deleting!\n", name)); - ret = sysdb_delete_user(sysdb, domain, name, uid); + ret = sysdb_delete_user(domain, name, uid); if (ret == ENOENT) { ret = EOK; } @@ -279,7 +279,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, } } - ret = sysdb_store_user(sysdb, domain, + ret = sysdb_store_user(domain, real_name, pwd->pw_passwd, pwd->pw_uid, @@ -626,7 +626,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, } } - ret = sysdb_store_group(sysdb, dom, + ret = sysdb_store_group(dom, real_name, grp->gr_gid, attrs, @@ -883,7 +883,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, ("Group %s does not exist (or is invalid) on remote server," " deleting!\n", name)); - ret = sysdb_delete_group(sysdb, dom, NULL, gid); + ret = sysdb_delete_group(dom, NULL, gid); if (ret == ENOENT) { ret = EOK; } @@ -961,7 +961,7 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, ("Group %"SPRIgid" does not exist (or is invalid) on remote " "server, deleting!\n", gid)); - ret = sysdb_delete_group(sysdb, dom, NULL, gid); + ret = sysdb_delete_group(dom, NULL, gid); if (ret == ENOENT) { ret = EOK; } diff --git a/src/providers/proxy/proxy_netgroup.c b/src/providers/proxy/proxy_netgroup.c index 04a0b18d7..a201b2607 100644 --- a/src/providers/proxy/proxy_netgroup.c +++ b/src/providers/proxy/proxy_netgroup.c @@ -91,8 +91,8 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, } } - ret = sysdb_add_netgroup(sysdb, domain, name, NULL, - attrs, NULL, cache_timeout, 0); + ret = sysdb_add_netgroup(domain, name, NULL, attrs, NULL, + cache_timeout, 0); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); return ret; @@ -101,7 +101,7 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, return EOK; } -static errno_t handle_error(enum nss_status status, struct sysdb_ctx *sysdb, +static errno_t handle_error(enum nss_status status, struct sss_domain_info *domain, const char *name) { errno_t ret; @@ -114,7 +114,7 @@ static errno_t handle_error(enum nss_status status, struct sysdb_ctx *sysdb, case NSS_STATUS_NOTFOUND: DEBUG(SSSDBG_MINOR_FAILURE, ("The netgroup was not found\n")); - ret = sysdb_delete_netgroup(sysdb, domain, name); + ret = sysdb_delete_netgroup(domain, name); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot delete netgroup: %d\n", ret)); ret = EIO; @@ -153,7 +153,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, if (status != NSS_STATUS_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, ("setnetgrent failed for netgroup [%s].\n", name)); - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); goto done; } @@ -176,7 +176,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, if (status != NSS_STATUS_SUCCESS && status != NSS_STATUS_RETURN && status != NSS_STATUS_NOTFOUND) { - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); DEBUG(SSSDBG_OP_FAILURE, ("getnetgrent_r failed for netgroup [%s]: [%d][%s].\n", name, ret, strerror(ret))); @@ -195,7 +195,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, status = ctx->ops.endnetgrent(&result); if (status != NSS_STATUS_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, ("endnetgrent failed.\n")); - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); goto done; } @@ -203,7 +203,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, !dom->case_sensitive, dom->netgroup_timeout); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, ("save_netgroup failed.\n")); goto done; } |