From d22506a343cec61b7d1a48c970b63a8458b267ab Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 27 Apr 2018 11:57:08 +0200 Subject: 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 --- dirmngr/dirmngr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dirmngr/dirmngr.c') 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)) -- cgit v1.2.3