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_ldap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dirmngr/dirmngr_ldap.c') diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index 5be4e5814..e05c77925 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -29,7 +29,6 @@ # include #endif #include -#include #include #include #ifndef USE_LDAPWRAPPER @@ -343,7 +342,7 @@ ldap_wrapper_main (char **argv, estream_t outstream) usage (1); #else /* All passed arguments should be fine in this case. */ - assert (argc); + log_assert (argc); #endif #ifdef USE_LDAPWRAPPER -- cgit v1.2.3