From 339f0840e11b1421338966edd0d5dc97af24ad26 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 30 Apr 2004 16:36:36 +0000 Subject: (main) : Use gpg.conf and not /dev/null as default filename. --- g10/ChangeLog | 5 +++++ 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 + + * g10.c (main) : Use gpg.conf and not /dev/null as + default filename. + 2004-04-28 Werner Koch * card-util.c (card_edit): Remove PIN verification. diff --git a/g10/g10.c b/g10/g10.c index 006e88ad2..915011026 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -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" -- cgit v1.2.3