[svn] GnuPG - r5423 - in branches/STABLE-BRANCH-2-0: . agent doc g10

[svn author wk]

Author: wk
Date: 2010-09-24 15:06:56 +0200 (Fri, 24 Sep 2010)
New Revision: 5423

Modified:
   branches/STABLE-BRANCH-2-0/NEWS
   branches/STABLE-BRANCH-2-0/agent/ChangeLog
   branches/STABLE-BRANCH-2-0/agent/gpg-agent.c
   branches/STABLE-BRANCH-2-0/doc/gpgsm.texi
   branches/STABLE-BRANCH-2-0/g10/card-util.c
Log:
Fix bug 1285


Modified: branches/STABLE-BRANCH-2-0/agent/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-09-23 09:09:49 UTC (rev 5422)
+++ branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-09-24 13:06:56 UTC (rev 5423)
@@ -1,3 +1,9 @@
+2010-09-24  Werner Koch  <wk at g10code.com>
+
+	* gpg-agent.c (main, reread_configuration): Always test whether
+	the default configuration file has been created in the meantime.
+	Fixes bug#1285.
+
 2010-08-11  Werner Koch  <wk at g10code.com>
 
 	* call-pinentry.c (agent_askpin, agent_get_passphrase): Fix

Modified: branches/STABLE-BRANCH-2-0/NEWS
===================================================================
--- branches/STABLE-BRANCH-2-0/NEWS	2010-09-23 09:09:49 UTC (rev 5422)
+++ branches/STABLE-BRANCH-2-0/NEWS	2010-09-24 13:06:56 UTC (rev 5423)
@@ -3,7 +3,9 @@
 
  * Fixed output of "gpgconf --check-options".
 
+ * gpg-agent now tests for a newly created gpg-agent.conf after a HUP.
 
+
 Noteworthy changes in version 2.0.16 (2010-07-19)
 -------------------------------------------------
 

Modified: branches/STABLE-BRANCH-2-0/agent/gpg-agent.c
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/gpg-agent.c	2010-09-23 09:09:49 UTC (rev 5422)
+++ branches/STABLE-BRANCH-2-0/agent/gpg-agent.c	2010-09-24 13:06:56 UTC (rev 5423)
@@ -724,6 +724,12 @@
               if( parse_debug )
                 log_info (_("NOTE: no default option file `%s'\n"),
                           configname );
+              /* Save the default conf file name so that
+                 reread_configuration is able to test whether the
+                 config file has been created in the meantime.  */
+              xfree (config_filename);
+              config_filename = configname;
+              configname = NULL;
 	    }
           else
             {
@@ -811,10 +817,15 @@
       fclose( configfp );
       configfp = NULL;
       /* Keep a copy of the name so that it can be read on SIGHUP. */
-      config_filename = configname;
+      if (config_filename != configname)
+        {
+          xfree (config_filename);
+          config_filename = configname;
+        }
       configname = NULL;
       goto next_pass;
     }
+    
   xfree (configname);
   configname = NULL;
   if (log_get_errorcount(0))
@@ -1332,8 +1343,8 @@
   fp = fopen (config_filename, "r");
   if (!fp)
     {
-      log_error (_("option file `%s': %s\n"),
-                 config_filename, strerror(errno) );
+      log_info (_("option file `%s': %s\n"),
+                config_filename, strerror(errno) );
       return;
     }
 

Modified: branches/STABLE-BRANCH-2-0/doc/gpgsm.texi
===================================================================
--- branches/STABLE-BRANCH-2-0/doc/gpgsm.texi	2010-09-23 09:09:49 UTC (rev 5422)
+++ branches/STABLE-BRANCH-2-0/doc/gpgsm.texi	2010-09-24 13:06:56 UTC (rev 5423)
@@ -31,7 +31,7 @@
 @command{gpgsm} is a tool similar to @command{gpg} to provide digital
 encryption and signing services on X.509 certificates and the CMS
 protocol.  It is mainly used as a backend for S/MIME mail processing.
- at command{gpgsm} includes a full features certificate management and
+ at command{gpgsm} includes a full featured certificate management and
 complies with all rules defined for the German Sphinx project.
 
 @manpause
@@ -286,7 +286,7 @@
 @node GPGSM Options
 @section Option Summary
 
- at command{GPGSM} comes features a bunch of options to control the exact behaviour
+ at command{GPGSM} features a bunch of options to control the exact behaviour
 and to change the default configuration.
 
 @menu 

Modified: branches/STABLE-BRANCH-2-0/g10/card-util.c
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/card-util.c	2010-09-23 09:09:49 UTC (rev 5422)
+++ branches/STABLE-BRANCH-2-0/g10/card-util.c	2010-09-24 13:06:56 UTC (rev 5423)
@@ -207,6 +207,9 @@
     case 0x0005: return "ZeitControl";
 
     case 0x002A: return "Magrathea";
+
+    case 0xF517: return "FSIJ";
+
       /* 0x00000 and 0xFFFF are defined as test cards per spec,
          0xFFF00 to 0xFFFE are assigned for use with randomly created
          serial numbers.  */