mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
2008-02-09 Marcus Brinkmann <marcus@g10code.de>
* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set in gpgconf-list output.
This commit is contained in:
parent
791d8e6990
commit
2bdbb92939
@ -1,3 +1,8 @@
|
||||
2008-02-09 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
|
||||
in gpgconf-list output.
|
||||
|
||||
2007-12-10 Werner Koch <wk@g10code.com>
|
||||
|
||||
* app-openpgp.c (do_decipher): Take care of cryptograms shorter
|
||||
|
@ -555,8 +555,10 @@ main (int argc, char **argv )
|
||||
char *filename = NULL;
|
||||
char *filename_esc;
|
||||
|
||||
if (!config_filename)
|
||||
filename = make_filename (opt.homedir, "scdaemon.conf", NULL );
|
||||
if (config_filename)
|
||||
filename = xstrdup (config_filename);
|
||||
else
|
||||
filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
|
||||
filename_esc = percent_escape (filename, NULL);
|
||||
|
||||
printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",
|
||||
|
Loading…
x
Reference in New Issue
Block a user