diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 3 | ||||
| -rw-r--r-- | sm/gpgsm.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 6c3ff32fb..aaf5d9047 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,5 +1,8 @@ 2004-04-26 Werner Koch <[email protected]> + * gpgsm.c (main) <gpgconf>: Do not use /dev/null as default config + filename. + * call-agent.c (gpgsm_agent_pksign, gpgsm_agent_pkdecrypt) (gpgsm_agent_genkey, gpgsm_agent_istrusted) (gpgsm_agent_marktrusted, gpgsm_agent_havekey) diff --git a/sm/gpgsm.c b/sm/gpgsm.c index eff167367..33d8a2c48 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1294,9 +1294,11 @@ main ( int argc, char **argv) a default, which is described by the value of the ARGDEF field. */ #define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6) + if (!config_filename) + config_filename = make_filename (opt.homedir, "gpgsm.conf", NULL); + printf ("gpgconf-gpgsm.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT, - config_filename?config_filename:"/dev/null"); + GC_OPT_FLAG_DEFAULT, config_filename); printf ("verbose:%lu:\n" "quiet:%lu:\n" |