From 87bce14e200e16b3f6ec9a79333b2a9da0274fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 24 Aug 2016 13:25:44 +0200 Subject: [PATCH 16/39] PROXY: Remove cache_timeout attribute from save_user() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As this function already receives a struct sss_domain_info * parameter as argument, we can simply get the cache_timeout attribute by accessing domain->user_timeout. Related: https://fedorahosted.org/sssd/ticket/3134 Signed-off-by: Fabiano Fidêncio Reviewed-by: Lukáš Slebodník (cherry picked from commit 2537fe318a3866780abca100cf6eb7c258f9d02b) --- src/providers/proxy/proxy_id.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index ff2631c9b493c8c688919139114da5520b428e04..bdcac66319897981c21e7fd7da7334ee97d010f6 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -32,7 +32,7 @@ static int save_user(struct sss_domain_info *domain, struct passwd *pwd, const char *real_name, - const char *alias, uint64_t cache_timeout); + const char *alias); static int handle_getpw_result(enum nss_status status, struct passwd *pwd, @@ -143,7 +143,7 @@ static int get_pw_name(struct proxy_id_ctx *ctx, } /* Both lookups went fine, we can save the user now */ - ret = save_user(dom, pwd, real_name, i_name, dom->user_timeout); + ret = save_user(dom, pwd, real_name, i_name); done: talloc_zfree(tmpctx); @@ -224,7 +224,7 @@ delete_user(struct sss_domain_info *domain, static int save_user(struct sss_domain_info *domain, struct passwd *pwd, const char *real_name, - const char *alias, uint64_t cache_timeout) + const char *alias) { const char *shell; const char *gecos; @@ -299,7 +299,7 @@ static int save_user(struct sss_domain_info *domain, NULL, attrs, NULL, - cache_timeout, + domain->user_timeout, 0); if (ret) { DEBUG(SSSDBG_OP_FAILURE, "Could not add user to cache\n"); @@ -365,7 +365,7 @@ static int get_pw_uid(struct proxy_id_ctx *ctx, pwd->pw_name); goto done; } - ret = save_user(dom, pwd, name, NULL, dom->user_timeout); + ret = save_user(dom, pwd, name, NULL); done: talloc_zfree(tmpctx); @@ -495,7 +495,7 @@ static int enum_users(TALLOC_CTX *mem_ctx, pwd->pw_name); goto done; } - ret = save_user(dom, pwd, name, NULL, dom->user_timeout); + ret = save_user(dom, pwd, name, NULL); if (ret) { /* Do not fail completely on errors. * Just report the failure to save and go on */ @@ -1328,7 +1328,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, goto done; } - ret = save_user(dom, pwd, real_name, i_name, dom->user_timeout); + ret = save_user(dom, pwd, real_name, i_name); if (ret) { DEBUG(SSSDBG_OP_FAILURE, "Could not save user\n"); goto fail; -- 2.9.3