mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg,gpgsm: New option --log-time
* g10/gpg.c (oLogTime): New. (opts): Add "log-time". (opt_log_time): New var. (main): Implement. * sm/gpgsm.c (oLogTime): New. (opts): Add "log-time". (opt_log_time): New var. (main): Implement.
This commit is contained in:
parent
2d088176b4
commit
d2d1db8860
4 changed files with 27 additions and 0 deletions
10
sm/gpgsm.c
10
sm/gpgsm.c
|
@ -114,6 +114,7 @@ enum cmd_and_opt_values {
|
|||
oNoLogFile,
|
||||
oAuditLog,
|
||||
oHtmlAuditLog,
|
||||
oLogTime,
|
||||
|
||||
oEnableSpecialFilenames,
|
||||
|
||||
|
@ -288,6 +289,7 @@ static gpgrt_opt_t opts[] = {
|
|||
N_("|FILE|write server mode logs to FILE")),
|
||||
ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
|
||||
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
||||
ARGPARSE_s_n (oLogTime, "log-time", "@"),
|
||||
ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
|
||||
|
||||
|
||||
|
@ -499,6 +501,9 @@ static int maybe_setuid = 1;
|
|||
static const char *debug_level;
|
||||
static unsigned int debug_value;
|
||||
|
||||
/* Helper for --log-time; */
|
||||
static int opt_log_time;
|
||||
|
||||
/* Default value for include-certs. We need an extra macro for
|
||||
gpgconf-list because the variable will be changed by the command
|
||||
line option.
|
||||
|
@ -1247,6 +1252,7 @@ main ( int argc, char **argv)
|
|||
|
||||
case oLogFile: logfile = pargs.r.ret_str; break;
|
||||
case oNoLogFile: logfile = NULL; break;
|
||||
case oLogTime: opt_log_time = 1; break;
|
||||
|
||||
case oAuditLog: auditlog = pargs.r.ret_str; break;
|
||||
case oHtmlAuditLog: htmlauditlog = pargs.r.ret_str; break;
|
||||
|
@ -1579,6 +1585,10 @@ main ( int argc, char **argv)
|
|||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
else if (opt_log_time)
|
||||
log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY
|
||||
|GPGRT_LOG_WITH_TIME));
|
||||
|
||||
|
||||
if (gnupg_faked_time_p ())
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue