diff options
| author | Werner Koch <[email protected]> | 2004-04-26 13:46:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-04-26 13:46:36 +0000 |
| commit | 5fa53f752458107ecfc49c4a58fb87123193fdfa (patch) | |
| tree | 114d069122730358ab6a4b6b5b3c516511bf1473 /sm/gpgsm.c | |
| parent | * call-agent.c (gpgsm_agent_pksign, gpgsm_agent_pkdecrypt) (diff) | |
| download | gnupg-5fa53f752458107ecfc49c4a58fb87123193fdfa.tar.gz gnupg-5fa53f752458107ecfc49c4a58fb87123193fdfa.zip | |
* scdaemon.c (main): Do the last change the usual way. This is so
that we can easily test for versioned config files above.
* gpgsm.c (main) <gpgconf>: Do not use /dev/null as default config
filename.
Diffstat (limited to '')
| -rw-r--r-- | sm/gpgsm.c | 6 |
1 files changed, 4 insertions, 2 deletions
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" |