Page MenuHome GnuPG

Needs ReviewPublic

Authored by dkg on Nov 15 2016, 1:51 AM.
This revision needs review, but there are no reviewers specified.



From: Daniel Kahn Gillmor <>
Date: Mon, 31 Oct 2016 19:52:31 -0400
Subject: dirmngr: Lazily launch ldap reaper thread.

  • dirmngr/dirmngr.c (main): Avoid calling ldap_wrapper_launch_thread()

Before we need it.

  • dirmngr/ldap-wrapper.c (ldap_wrapper): Call

ldap_wrapper_launch_thread() just in time (before any attempt to use
an ldap subprocess).

A dirmngr process that never looks anything up in LDAP has no need for
a reaper thread, but one was started automatically. This thread wakes
up every two seconds to look for ldap processes that might never have
been running. We won't start more than one reaper thread for any
given dirmngr due to the static int "done" in
ldap_wrapper_launch_thread(), so it's safe to call this every time
there is a use of ldap_wrapper.

If someone wants to do further dirmngr optimizations for ldap users,
the reaper thread itself could use dynamically-calculated timeouts
(and probably needs to be alerted dynamically when a new ldap
subprocess is available so it can re-calculate those timeouts).

Note: It's not clear to me how to test ldap access effectively; i know
of no public ldap services that i can verify against, and i do not run
my own ldap servers. If someone has a publicly-available ldap server
that developers can run tests against, i would be happy to hear about

Signed-off-by: Daniel Kahn Gillmor <>

dirmngr/dirmngr.c | 18 ------------------
dirmngr/ldap-wrapper.c | 7 ++++---
2 files changed, 4 insertions(+), 21 deletions(-)

Test Plan

Diff Detail

Lint Skipped
Unit Tests Skipped