[svn] GnuPG - r4690 - trunk/scd

[svn author marcus]

Author: marcus
Date: 2008-02-09 01:13:43 +0100 (Sat, 09 Feb 2008)
New Revision: 4690

Modified:
   trunk/scd/ChangeLog
   trunk/scd/scdaemon.c
Log:
2008-02-09  Marcus Brinkmann  <marcus at g10code.de>

	* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
	in gpgconf-list output.


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2008-02-09 00:05:55 UTC (rev 4689)
+++ trunk/scd/ChangeLog	2008-02-09 00:13:43 UTC (rev 4690)
@@ -1,3 +1,8 @@
+2008-02-09  Marcus Brinkmann  <marcus at g10code.de>
+
+	* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
+	in gpgconf-list output.
+
 2007-12-10  Werner Koch  <wk at g10code.com>
 
 	* app-openpgp.c (do_decipher): Take care of cryptograms shorter

Modified: trunk/scd/scdaemon.c
===================================================================
--- trunk/scd/scdaemon.c	2008-02-09 00:05:55 UTC (rev 4689)
+++ trunk/scd/scdaemon.c	2008-02-09 00:13:43 UTC (rev 4690)
@@ -555,8 +555,10 @@
       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",