(main) <gpgconf>: Use gpg.conf and not /dev/null as
authorWerner Koch <wk@gnupg.org>
Fri, 30 Apr 2004 16:36:36 +0000 (16:36 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 30 Apr 2004 16:36:36 +0000 (16:36 +0000)
default filename.

g10/ChangeLog
g10/g10.c

index 86c6c79..0e87c2f 100644 (file)
@@ -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.
index 006e88a..9150110 100644 (file)
--- 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"