diff options
| author | Werner Koch <[email protected]> | 2018-04-27 09:57:08 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-04-27 09:57:08 +0000 |
| commit | d22506a343cec61b7d1a48c970b63a8458b267ab (patch) | |
| tree | 349bcfba06d424cb0bee8d751a95c4667430deb2 /dirmngr/ldap.c | |
| parent | dirmngr: Lower the dead host resurrection time to 1.5h (diff) | |
| download | gnupg-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 '')
| -rw-r--r-- | dirmngr/ldap.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c index adf83071e..cb3c0b763 100644 --- a/dirmngr/ldap.c +++ b/dirmngr/ldap.c @@ -136,8 +136,12 @@ run_ldap_wrapper (ctrl_t ctrl, argv[argc++] = "--pass"; argv[argc++] = pass; } - if (opt.verbose) + + if (DBG_LOOKUP) argv[argc++] = "-vv"; + else if (DBG_EXTPROG) + argv[argc++] = "-v"; + argv[argc++] = "--log-with-pid"; if (multi_mode) argv[argc++] = "--multi"; @@ -564,8 +568,12 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context, argv[argc++] = "--pass"; argv[argc++] = pass; } - if (opt.verbose) + + if (DBG_LOOKUP) argv[argc++] = "-vv"; + else if (DBG_EXTPROG) + argv[argc++] = "-v"; + argv[argc++] = "--log-with-pid"; argv[argc++] = "--multi"; if (opt.ldaptimeout) |