From d153e4936e05ab3b15df3c092024d83ac9d6ca46 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 21 Apr 2021 13:16:49 +0200
Subject: [PATCH] gpg,sm: Ignore the log-file option from common.conf.

* g10/gpg.c (main): Don't use the default log file from common.conf.
* sm/gpgsm.c (main): Ditto.
--

That was acutally not intended and contradicts the description in
doc/example/common.conf.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 g10/gpg.c  | 6 ------
 sm/gpgsm.c | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index 3332525d8..f5623be76 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3723,12 +3723,6 @@ main (int argc, char **argv)
         g10_exit(2);
       }
 
-    if (!logfile)
-      {
-        logfile = comopt.logfile;
-        comopt.logfile = NULL;
-      }
-
     if (opt.use_keyboxd)
       log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
                 "use-keyboxd");
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index ca30358ec..f488eb5e8 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1008,7 +1008,6 @@ main ( int argc, char **argv)
   estream_t htmlauditfp = NULL;
   struct assuan_malloc_hooks malloc_hooks;
   int pwfd = -1;
-  int no_logfile = 0;
 
   static const char *homedirvalue;
   static const char *changeuser;
@@ -1359,7 +1358,7 @@ main ( int argc, char **argv)
           break;
 
         case oLogFile: logfile = pargs.r.ret_str; break;
-        case oNoLogFile: logfile = NULL; no_logfile = 1; break;
+        case oNoLogFile: logfile = NULL; break;
 
         case oAuditLog: auditlog = pargs.r.ret_str; break;
         case oHtmlAuditLog: htmlauditlog = pargs.r.ret_str; break;
@@ -1626,12 +1625,6 @@ main ( int argc, char **argv)
       gpgsm_exit(2);
     }
 
-  if (!logfile && !no_logfile)
-    {
-      logfile = comopt.logfile;
-      comopt.logfile = NULL;
-    }
-
   if (opt.use_keyboxd)
     log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
               "use-keyboxd");