diff options
author | Petr Cech <pcech@redhat.com> | 2016-04-22 09:19:57 -0400 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-05-11 12:52:13 +0200 |
commit | 4f87f99f95891ebc0814e4566fa2defb4359b008 (patch) | |
tree | 98f94b4d877d6c77c891c95274ccee89ad9154c8 /src/responder | |
parent | 7910bc6c991b63fa716d77eba08b5f5d83ea6a72 (diff) | |
download | sssd-4f87f99f95891ebc0814e4566fa2defb4359b008.tar.gz sssd-4f87f99f95891ebc0814e4566fa2defb4359b008.tar.xz sssd-4f87f99f95891ebc0814e4566fa2defb4359b008.zip |
RESPONDER: Removing neg_timeout from nss responder
Timeout of negative cahce is handled by internal negative cache
context. This patch removes neg_timeout from struct nss_ctx.
Resolves:
https://fedorahosted.org/sssd/ticket/2317
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/responder')
-rw-r--r-- | src/responder/common/responder_cache_req.c | 1 | ||||
-rw-r--r-- | src/responder/nss/nsssrv.c | 5 | ||||
-rw-r--r-- | src/responder/nss/nsssrv.h | 1 | ||||
-rw-r--r-- | src/responder/nss/nsssrv_netgroup.c | 7 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/responder/common/responder_cache_req.c b/src/responder/common/responder_cache_req.c index 1ad141281..a3253a5ef 100644 --- a/src/responder/common/responder_cache_req.c +++ b/src/responder/common/responder_cache_req.c @@ -896,7 +896,6 @@ struct cache_req_cache_state { struct tevent_context *ev; struct resp_ctx *rctx; struct sss_nc_ctx *ncache; - int neg_timeout; int cache_refresh_percent; struct cache_req *cr; diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index 5dfee5a32..363ee7bff 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -230,11 +230,6 @@ static int nss_get_config(struct nss_ctx *nctx, &nctx->enum_cache_timeout); if (ret != EOK) goto done; - ret = confdb_get_int(cdb, CONFDB_NSS_CONF_ENTRY, - CONFDB_NSS_ENTRY_NEG_TIMEOUT, 15, - &nctx->neg_timeout); - if (ret != EOK) goto done; - ret = confdb_get_bool(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_FILTER_USERS_IN_GROUPS, true, &nctx->filter_users_in_groups); diff --git a/src/responder/nss/nsssrv.h b/src/responder/nss/nsssrv.h index e293e3b4d..28e62b78a 100644 --- a/src/responder/nss/nsssrv.h +++ b/src/responder/nss/nsssrv.h @@ -44,7 +44,6 @@ struct sss_mc_ctx; struct nss_ctx { struct resp_ctx *rctx; - int neg_timeout; struct sss_nc_ctx *ncache; int cache_refresh_percent; diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c index 383b44a2c..cde3a2074 100644 --- a/src/responder/nss/nsssrv_netgroup.c +++ b/src/responder/nss/nsssrv_netgroup.c @@ -433,6 +433,7 @@ static void set_netgr_lifetime(uint32_t lifetime, static errno_t create_negcache_netgr(struct setent_step_ctx *step_ctx) { errno_t ret; + uint32_t lifetime; struct getent_ctx *netgr; /* Is there already netgroup with such name? */ @@ -466,7 +467,8 @@ static errno_t create_negcache_netgr(struct setent_step_ctx *step_ctx) netgr->ready = true; netgr->found = false; - set_netgr_lifetime(step_ctx->nctx->neg_timeout, step_ctx, netgr); + lifetime = sss_ncache_get_timeout(step_ctx->nctx->ncache); + set_netgr_lifetime(lifetime, step_ctx, netgr); ret = EOK; @@ -585,7 +587,8 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) "Failed to convert results into entries\n"); netgr->ready = true; netgr->found = false; - set_netgr_lifetime(step_ctx->nctx->neg_timeout, step_ctx, netgr); + lifetime = sss_ncache_get_timeout(step_ctx->nctx->ncache); + set_netgr_lifetime(lifetime, step_ctx, netgr); ret = EIO; goto done; } |