security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-07 17:33:02 +01:00
Code Activity

gpg,sm: Ignore the log-file option from common.conf.

Browse Source 
* 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>
This commit is contained in:
Werner Koch 2021-04-21 13:16:49 +02:00
parent b096757f62
commit d153e4936e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/gpg.c
View File

@ -3723,12 +3723,6 @@ main (int argc, char **argv)
g10_exit(2); g10_exit(2);
} }
if (!logfile)
{
logfile = comopt.logfile;
comopt.logfile = NULL;
}
if (opt.use_keyboxd) if (opt.use_keyboxd)
log_info ("Note: Please move option \"%s\" to \"common.conf\"\n", log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
"use-keyboxd"); "use-keyboxd");

9
sm/gpgsm.c
View File

@ -1008,7 +1008,6 @@ main ( int argc, char **argv)
estream_t htmlauditfp = NULL; estream_t htmlauditfp = NULL;
struct assuan_malloc_hooks malloc_hooks; struct assuan_malloc_hooks malloc_hooks;
int pwfd = -1; int pwfd = -1;
int no_logfile = 0;
static const char *homedirvalue; static const char *homedirvalue;
static const char *changeuser; static const char *changeuser;
@ -1359,7 +1358,7 @@ main ( int argc, char **argv)
break; break;
case oLogFile: logfile = pargs.r.ret_str; 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 oAuditLog: auditlog = pargs.r.ret_str; break;
case oHtmlAuditLog: htmlauditlog = 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); gpgsm_exit(2);
} }
if (!logfile && !no_logfile)
{
logfile = comopt.logfile;
comopt.logfile = NULL;
}
if (opt.use_keyboxd) if (opt.use_keyboxd)
log_info ("Note: Please move option \"%s\" to \"common.conf\"\n", log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
"use-keyboxd"); "use-keyboxd");