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 /scd/scdaemon.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 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index d0306aeb6..5e9737ae4 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -539,8 +539,6 @@ main (int argc, char **argv ) if (gpgconf_list) { - char *filename; - /* List options and default values in the GPG Conf format. */ /* The following list is taken from gnupg/tools/gpgconf-comp.c. */ @@ -559,11 +557,11 @@ main (int argc, char **argv ) /* The NO_ARG_DESC flag for an option indicates that the argument has 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, "scdaemon.conf", NULL ); - filename = make_filename (opt.homedir, "scdaemon.conf", NULL); printf ("gpgconf-scdaemon.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT, filename); - xfree (filename); + GC_OPT_FLAG_DEFAULT, config_filename); printf ("verbose:%lu:\n" "quiet:%lu:\n" |