diff options
author | Petr Cech <pcech@redhat.com> | 2016-04-22 08:05:06 -0400 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-05-11 12:50:25 +0200 |
commit | beb07d2f45856d4f3135f173cce551a2aa878f57 (patch) | |
tree | 7466016de523f9a6ea90f16a05eb59583d649d97 /src/responder/common | |
parent | f77ba726e3f8bd1e3cabdee66f38c4ed7a771913 (diff) | |
download | sssd-beb07d2f45856d4f3135f173cce551a2aa878f57.tar.gz sssd-beb07d2f45856d4f3135f173cce551a2aa878f57.tar.xz sssd-beb07d2f45856d4f3135f173cce551a2aa878f57.zip |
RESPONDER: Removing neg_timeout from pam responder
It removes neg_timeout parameter from struct pam_ctx. Timeout is
handled by context of negative cache internally.
This patch additioanlly removes neg_timeout from struct cache_req_state.
Resolves:
https://fedorahosted.org/sssd/ticket/2317
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/responder/common')
-rw-r--r-- | src/responder/common/responder_cache_req.c | 41 | ||||
-rw-r--r-- | src/responder/common/responder_cache_req.h | 20 |
2 files changed, 17 insertions, 44 deletions
diff --git a/src/responder/common/responder_cache_req.c b/src/responder/common/responder_cache_req.c index a9af150f2..1ad141281 100644 --- a/src/responder/common/responder_cache_req.c +++ b/src/responder/common/responder_cache_req.c @@ -912,7 +912,6 @@ static struct tevent_req *cache_req_cache_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, struct cache_req *cr) { @@ -929,7 +928,6 @@ static struct tevent_req *cache_req_cache_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->rctx = rctx; state->ncache = ncache; - state->neg_timeout = neg_timeout; state->cache_refresh_percent = cache_refresh_percent; state->cr = cr; @@ -1126,7 +1124,6 @@ struct cache_req_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; @@ -1150,7 +1147,6 @@ struct tevent_req *cache_req_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, struct cache_req_data *data) @@ -1170,7 +1166,6 @@ struct tevent_req *cache_req_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->rctx = rctx; state->ncache = ncache; - state->neg_timeout = neg_timeout; state->cache_refresh_percent = cache_refresh_percent; state->cr = cr = cache_req_create(state, rctx, data); if (state->cr == NULL) { @@ -1320,7 +1315,7 @@ static errno_t cache_req_next_domain(struct tevent_req *req) } subreq = cache_req_cache_send(state, state->ev, state->rctx, - state->ncache, state->neg_timeout, + state->ncache, state->cache_refresh_percent, state->cr); if (subreq == NULL) { @@ -1432,14 +1427,13 @@ cache_req_steal_data_and_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, struct cache_req_data *data) { struct tevent_req *req; - req = cache_req_send(mem_ctx, ev, rctx, ncache, neg_timeout, + req = cache_req_send(mem_ctx, ev, rctx, ncache, cache_refresh_percent, domain, data); if (req == NULL) { talloc_zfree(data); @@ -1456,7 +1450,6 @@ cache_req_user_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name) @@ -1469,8 +1462,7 @@ cache_req_user_by_name_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } struct tevent_req * @@ -1478,7 +1470,6 @@ cache_req_user_by_id_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, uid_t uid) @@ -1491,8 +1482,7 @@ cache_req_user_by_id_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } struct tevent_req * @@ -1500,7 +1490,6 @@ cache_req_user_by_cert_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *pem_cert) @@ -1513,7 +1502,7 @@ cache_req_user_by_cert_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, + cache_refresh_percent, domain, data); } @@ -1522,7 +1511,6 @@ cache_req_group_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name) @@ -1535,8 +1523,7 @@ cache_req_group_by_name_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } struct tevent_req * @@ -1544,7 +1531,6 @@ cache_req_group_by_id_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, gid_t gid) @@ -1557,8 +1543,7 @@ cache_req_group_by_id_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } struct tevent_req * @@ -1566,7 +1551,6 @@ cache_req_initgr_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name) @@ -1579,8 +1563,7 @@ cache_req_initgr_by_name_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } struct tevent_req * @@ -1598,7 +1581,7 @@ cache_req_user_by_filter_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, NULL, - 0, 0, domain, data); + 0, domain, data); } struct tevent_req * @@ -1616,7 +1599,7 @@ cache_req_group_by_filter_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, NULL, - 0, 0, domain, data); + 0, domain, data); } struct tevent_req * @@ -1624,7 +1607,6 @@ cache_req_object_by_sid_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *sid, @@ -1638,6 +1620,5 @@ cache_req_object_by_sid_send(TALLOC_CTX *mem_ctx, } return cache_req_steal_data_and_send(mem_ctx, ev, rctx, ncache, - neg_timeout, cache_refresh_percent, - domain, data); + cache_refresh_percent, domain, data); } diff --git a/src/responder/common/responder_cache_req.h b/src/responder/common/responder_cache_req.h index fbbc1e530..69fbaf416 100644 --- a/src/responder/common/responder_cache_req.h +++ b/src/responder/common/responder_cache_req.h @@ -68,7 +68,6 @@ struct tevent_req *cache_req_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, struct cache_req_data *data); @@ -84,7 +83,6 @@ cache_req_user_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name); @@ -97,7 +95,6 @@ cache_req_user_by_id_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, uid_t uid); @@ -107,13 +104,12 @@ cache_req_user_by_id_send(TALLOC_CTX *mem_ctx, struct tevent_req * cache_req_user_by_cert_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct resp_ctx *rctx, - struct sss_nc_ctx *ncache, - int neg_timeout, - int cache_refresh_percent, - const char *domain, - const char *pem_cert); + struct tevent_context *ev, + struct resp_ctx *rctx, + struct sss_nc_ctx *ncache, + int cache_refresh_percent, + const char *domain, + const char *pem_cert); #define cache_req_user_by_cert_recv(mem_ctx, req, _result, _domain, _name) \ cache_req_recv(mem_ctx, req, _result, _domain, _name) @@ -123,7 +119,6 @@ cache_req_group_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name); @@ -136,7 +131,6 @@ cache_req_group_by_id_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, gid_t gid); @@ -149,7 +143,6 @@ cache_req_initgr_by_name_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *name); @@ -182,7 +175,6 @@ cache_req_object_by_sid_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct resp_ctx *rctx, struct sss_nc_ctx *ncache, - int neg_timeout, int cache_refresh_percent, const char *domain, const char *sid, |