diff options
| author | Marcus Brinkmann <[email protected]> | 2004-03-23 12:21:29 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2004-03-23 12:21:29 +0000 |
| commit | 6c80bd0b49efd56b56eb76f3ccbe8ced27d65e33 (patch) | |
| tree | bfaabaa0fe42740e1b702b66b34ae2c6043e4954 | |
| parent | * gpg-agent.c (main) <gpgconf>: Fixed default value quoting. (diff) | |
| download | gnupg-6c80bd0b49efd56b56eb76f3ccbe8ced27d65e33.tar.gz gnupg-6c80bd0b49efd56b56eb76f3ccbe8ced27d65e33.zip | |
2004-03-23 Marcus Brinkmann <[email protected]>
* gpg-agent.c (main): For now, always print the default config
file name for --gpgconf-list.
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 484a5ffd7..9ffd8131c 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2004-03-23 Marcus Brinkmann <[email protected]> + + * gpg-agent.c (main): For now, always print the default config + file name for --gpgconf-list. + 2004-03-17 Werner Koch <[email protected]> * gpg-agent.c (main) <gpgconf>: Fixed default value quoting. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 2051d9080..010bbc53a 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -587,7 +587,10 @@ main (int argc, char **argv ) } if (gpgconf_list) - { /* List options and default values in the GPG Conf format. */ + { + char *filename; + + /* List options and default values in the GPG Conf format. */ /* The following list is taken from gnupg/tools/gpgconf-comp.c. */ /* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING @@ -606,9 +609,10 @@ 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) + filename = make_filename (opt.homedir, "gpg-agent.conf", NULL ); printf ("gpgconf-gpg-agent.conf:%lu:\"%s\n", - GC_OPT_FLAG_DEFAULT, - config_filename?config_filename:"/dev/null"); + GC_OPT_FLAG_DEFAULT, filename); + xfree (filename); printf ("verbose:%lu:\n" "quiet:%lu:\n" |