diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2017-06-05 15:19:13 +0200 |
---|---|---|
committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-09-01 20:25:37 +0200 |
commit | 9ef185255126b9ed415fa334f585a11c5be4fb1a (patch) | |
tree | f5c925ef63b503cc0f42e4bb137ac62b387c1c5f | |
parent | 2d40ce078a9071ac23353848d0849fbbbd600049 (diff) | |
download | sssd-9ef185255126b9ed415fa334f585a11c5be4fb1a.tar.gz sssd-9ef185255126b9ed415fa334f585a11c5be4fb1a.tar.xz sssd-9ef185255126b9ed415fa334f585a11c5be4fb1a.zip |
SECRETS: Do not link with c-ares
Since we started using libcurl for the proxy provider, there is no point
in initializing or linking against c-ares.
If we want to explicitly use a resolver in the future, we should use
libcurl callbacks.
Reviewed-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | src/responder/secrets/proxy.c | 2 | ||||
-rw-r--r-- | src/responder/secrets/secsrv.c | 6 | ||||
-rw-r--r-- | src/responder/secrets/secsrv.h | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 9fc3dfcd1..273ecc72f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1500,7 +1500,6 @@ sssd_secrets_SOURCES = \ src/util/sss_iobuf.c \ src/util/tev_curl.c \ $(SSSD_RESPONDER_OBJ) \ - $(SSSD_RESOLV_OBJ) \ $(NULL) sssd_secrets_LDADD = \ $(HTTP_PARSER_LIBS) \ diff --git a/src/responder/secrets/proxy.c b/src/responder/secrets/proxy.c index a4e97f83e..a910b3853 100644 --- a/src/responder/secrets/proxy.c +++ b/src/responder/secrets/proxy.c @@ -29,7 +29,6 @@ #define SEC_PROXY_TIMEOUT 5 struct proxy_context { - struct resolv_ctx *resctx; struct confdb_ctx *cdb; struct tcurl_ctx *tcurl; }; @@ -585,7 +584,6 @@ int proxy_secrets_provider_handle(struct sec_ctx *sctx, pctx = talloc(handle, struct proxy_context); if (!pctx) return ENOMEM; - pctx->resctx = sctx->resctx; pctx->cdb = sctx->rctx->cdb; pctx->tcurl = tcurl_init(pctx, sctx->rctx->ev); if (pctx->tcurl == NULL) { diff --git a/src/responder/secrets/secsrv.c b/src/responder/secrets/secsrv.c index b0467e90e..ae2a658ae 100644 --- a/src/responder/secrets/secsrv.c +++ b/src/responder/secrets/secsrv.c @@ -162,12 +162,6 @@ static int sec_process_init(TALLOC_CTX *mem_ctx, goto fail; } - ret = resolv_init(sctx, ev, SEC_NET_TIMEOUT, &sctx->resctx); - if (ret != EOK) { - /* not fatal for now */ - DEBUG(SSSDBG_CRIT_FAILURE, "Failed to initialize resolver library\n"); - } - /* Set up file descriptor limits */ responder_set_fd_limit(sctx->fd_limit); diff --git a/src/responder/secrets/secsrv.h b/src/responder/secrets/secsrv.h index 0575cbaba..1aad272da 100644 --- a/src/responder/secrets/secsrv.h +++ b/src/responder/secrets/secsrv.h @@ -30,10 +30,7 @@ #include <tevent.h> #include <ldb.h> -#define SEC_NET_TIMEOUT 5 - struct sec_ctx { - struct resolv_ctx *resctx; struct resp_ctx *rctx; int fd_limit; int containers_nest_level; |