aboutsummaryrefslogtreecommitdiffstats
path: root/sm/gpgsm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sm/gpgsm.c')
-rw-r--r--sm/gpgsm.c9
1 files changed, 1 insertions, 8 deletions
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");