security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-30 16:17:02 +01:00
Code Activity

2004-04-26 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* scdaemon.c (main): For now, always print default filename for
	--gpgconf-list, and never /dev/null.
This commit is contained in:
Marcus Brinkmann 2004-04-26 13:07:08 +00:00
parent 6aaceac7fe
commit 1101deced5
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2004-04-26 Marcus Brinkmann <marcus@g10code.de>
* scdaemon.c (main): For now, always print default filename for
--gpgconf-list, and never /dev/null.
2004-04-21 Werner Koch <wk@gnupg.org> 2004-04-21 Werner Koch <wk@gnupg.org>
* command.c (scd_update_reader_status_file): Send a signal back to * command.c (scd_update_reader_status_file): Send a signal back to

10
scd/scdaemon.c
View File

@ -538,7 +538,10 @@ main (int argc, char **argv )
} }
if (gpgconf_list) if (gpgconf_list)
{ /* List options and default values in the GPG Conf format. */ {
char *filename;
/* List options and default values in the GPG Conf format. */
/* The following list is taken from gnupg/tools/gpgconf-comp.c. */ /* The following list is taken from gnupg/tools/gpgconf-comp.c. */
/* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING /* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING
@ -557,9 +560,10 @@ main (int argc, char **argv )
a default, which is described by the value of the ARGDEF field. */ a default, which is described by the value of the ARGDEF field. */
#define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6) #define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6)
filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
printf ("gpgconf-scdaemon.conf:%lu:\"%s\n", printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",
GC_OPT_FLAG_DEFAULT, GC_OPT_FLAG_DEFAULT, filename);
config_filename?config_filename:"/dev/null"); xfree (filename);
printf ("verbose:%lu:\n" printf ("verbose:%lu:\n"
"quiet:%lu:\n" "quiet:%lu:\n"