0001-dirmngr-Fix-build-with--disable-ldap.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From c6900f5723b4edc899aaea267ed599b5ad724142 Mon Sep 17 00:00:00 2001
  2. From: NIIBE Yutaka <gniibe@fsij.org>
  3. Date: Fri, 11 Jun 2021 10:30:02 +0900
  4. Subject: [PATCH] dirmngr: Fix build with --disable-ldap.
  5. * dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]:
  6. Conditionalize.
  7. --
  8. Reported-by: Phil Pennock
  9. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
  10. (cherry picked from commit c8b2162c0e7eb42b74811b7ed225fa0f56be4083)
  11. [Retrieved from:
  12. https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=c6900f5723b4edc899aaea267ed599b5ad724142]
  13. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  14. ---
  15. dirmngr/dirmngr.c | 2 ++
  16. 1 file changed, 2 insertions(+)
  17. diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
  18. index 915e0e601..330983f3f 100644
  19. --- a/dirmngr/dirmngr.c
  20. +++ b/dirmngr/dirmngr.c
  21. @@ -770,6 +770,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
  22. case oRecursiveResolver: enable_recursive_resolver (1); break;
  23. case oLDAPServer:
  24. +#if USE_LDAP
  25. {
  26. ldap_server_t server;
  27. char *p;
  28. @@ -791,6 +792,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
  29. opt.ldapservers = server;
  30. }
  31. }
  32. +#endif
  33. break;
  34. case oKeyServer:
  35. --
  36. 2.11.0