diff options
| author | Werner Koch <[email protected]> | 2021-04-21 11:16:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-04-21 12:40:08 +0000 |
| commit | d153e4936e05ab3b15df3c092024d83ac9d6ca46 (patch) | |
| tree | 4c260d1d4e76527af7c93b3d7a53014f68461b75 | |
| parent | po: Fix typo in German translation. (diff) | |
| download | gnupg-d153e4936e05ab3b15df3c092024d83ac9d6ca46.tar.gz gnupg-d153e4936e05ab3b15df3c092024d83ac9d6ca46.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/gpg.c | 6 | ||||
| -rw-r--r-- | sm/gpgsm.c | 9 |
2 files changed, 1 insertions, 14 deletions
@@ -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"); |