aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-04-27 09:57:08 +0000
committerWerner Koch <[email protected]>2018-04-27 09:57:08 +0000
commitd22506a343cec61b7d1a48c970b63a8458b267ab (patch)
tree349bcfba06d424cb0bee8d751a95c4667430deb2 /dirmngr/dirmngr.c
parentdirmngr: Lower the dead host resurrection time to 1.5h (diff)
downloadgnupg-d22506a343cec61b7d1a48c970b63a8458b267ab.tar.gz
gnupg-d22506a343cec61b7d1a48c970b63a8458b267ab.zip
dirmngr: Silence log output from dirmngr_ldap.
* dirmngr/dirmngr_ldap.c: Remove assert.h. (main): Replace assert by log_assert. * dirmngr/ldap.c (run_ldap_wrapper): Use debug options to pass verbose options to dirmngr_ldap. (start_cert_fetch_ldap): Ditto. -- verbose is a pretty common option in dirmngr.conf and it would clutter the logs with output from dirmngr_ldap. Now we require DBG_EXTPROG or DBG_LOOKUP to make dirmngr_ldap more verbose. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
-rw-r--r--dirmngr/dirmngr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 17adae2f4..31f8e0f46 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2235,7 +2235,8 @@ handle_connections (assuan_fd_t listen_fd)
npth_timersub (&abstime, &curtime, &timeout);
#ifndef HAVE_W32_SYSTEM
- ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout, npth_sigev_sigmask());
+ ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
+ npth_sigev_sigmask());
saved_errno = errno;
while (npth_sigev_get_pending(&signo))