diff options
| author | Werner Koch <wk@gnupg.org> | 2004-04-30 18:36:36 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-04-30 18:36:36 +0200 |
| commit | 339f0840e11b1421338966edd0d5dc97af24ad26 (patch) | |
| tree | d5069190015ab103e2e38dbe129f86e4c120dd59 | |
| parent | * protect-tool.c: New option --enable-status-msg. (diff) | |
| download | gnupg2-339f0840e11b1421338966edd0d5dc97af24ad26.tar.xz gnupg2-339f0840e11b1421338966edd0d5dc97af24ad26.zip | |
(main) <gpgconf>: Use gpg.conf and not /dev/null as
default filename.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/g10.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 86c6c7957..0e87c2f46 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-04-30 Werner Koch <wk@gnupg.org> + + * g10.c (main) <gpgconf>: Use gpg.conf and not /dev/null as + default filename. + 2004-04-28 Werner Koch <wk@gnupg.org> * card-util.c (card_edit): Remove PIN verification. @@ -2953,9 +2953,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, "gpg.conf", NULL); + printf ("gpgconf-gpg.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" |