From 45918813f0599505e4f84bd44b09fb708b4e7f23 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 20 Apr 2021 10:50:10 +0200
Subject: Support log-file option from common.conf for all daemon.

* agent/gpg-agent.c: Include comopt.h.
(main): Read log-file option from common.conf.
(reread_configuration): Ditto.
* dirmngr/dirmngr.c: Include comopt.h.
(main): Read log-file option from common.conf.
(reread_configuration): Ditto.
* kbx/keyboxd.c: Include comopt.h.
(main): Read log-file option from common.conf.
(reread_configuration): Ditto.
* scd/scdaemon.c: Include comopt.h.
(main): Read log-file option from common.conf.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 kbx/keyboxd.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'kbx')

diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index be9098c13..76a0694a4 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -58,6 +58,7 @@
 #include "../common/init.h"
 #include "../common/gc-opt-flags.h"
 #include "../common/exechelp.h"
+#include "../common/comopt.h"
 #include "frontend.h"
 
 
@@ -610,6 +611,14 @@ main (int argc, char **argv )
   if (log_get_errorcount(0))
     exit (2);
 
+    /* Get a default log file from common.conf.  */
+  if (!logfile && !parse_comopt (GNUPG_MODULE_NAME_KEYBOXD, debug_argparser))
+    {
+      logfile = comopt.logfile;
+      comopt.logfile = NULL;
+    }
+
+
   finalize_rereadable_options ();
 
   /* Print a warning if an argument looks like an option.  */
@@ -988,9 +997,10 @@ reread_configuration (void)
   gpgrt_argparse_t pargs;
   char *twopart;
   int dummy;
+  int logfile_seen = 0;
 
   if (!config_filename)
-    return; /* No config file. */
+    goto finish; /* No config file. */
 
   twopart = strconcat ("keyboxd" EXTSEP_S "conf" PATHSEP_S,
                        config_filename, NULL);
@@ -1015,12 +1025,29 @@ reread_configuration (void)
       else if (pargs.r_opt < -1)
         pargs.err = ARGPARSE_PRINT_WARNING;
       else /* Try to parse this option - ignore unchangeable ones. */
-        parse_rereadable_options (&pargs, 1);
+        {
+          if (pargs.r_opt == oLogFile)
+            logfile_seen = 1;
+          parse_rereadable_options (&pargs, 1);
+        }
     }
   gpgrt_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
   xfree (twopart);
   finalize_rereadable_options ();
   set_debug ();
+
+ finish:
+  /* Get a default log file from common.conf.  */
+  if (!logfile_seen && !parse_comopt (GNUPG_MODULE_NAME_KEYBOXD, !!opt.debug))
+    {
+      if (!current_logfile || !comopt.logfile
+          || strcmp (current_logfile, comopt.logfile))
+        {
+          log_set_file (comopt.logfile);
+          xfree (current_logfile);
+          current_logfile = comopt.logfile? xtrystrdup (comopt.logfile) : NULL;
+        }
+    }
 }
 
 
-- 
cgit v1.2.3