security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

2008-02-09 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
	in gpgconf-list output.
This commit is contained in:
Marcus Brinkmann 2008-02-09 00:13:43 +00:00
parent 791d8e6990
commit 2bdbb92939
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scd/ChangeLog
View File

@ -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> 2007-12-10 Werner Koch <wk@g10code.com>
* app-openpgp.c (do_decipher): Take care of cryptograms shorter * app-openpgp.c (do_decipher): Take care of cryptograms shorter

6
scd/scdaemon.c
View File

@ -555,8 +555,10 @@ main (int argc, char **argv )
char *filename = NULL; char *filename = NULL;
char *filename_esc; char *filename_esc;
if (!config_filename) if (config_filename)
filename = make_filename (opt.homedir, "scdaemon.conf", NULL ); filename = xstrdup (config_filename);
else
filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
filename_esc = percent_escape (filename, NULL); filename_esc = percent_escape (filename, NULL);
printf ("gpgconf-scdaemon.conf:%lu:\"%s\n", printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",