Fix for bug#1066.

A couple of minor changes.

10 files changed, 36 insertions, 23 deletions

diff --git a/THANKS b/THANKS
index a56d985df..b27952893 100644
--- a/THANKS
+++ b/THANKS
@@ -115,6 +115,7 @@ Jean-loup Gailly	   gzip at prep.ai.mit.edu
 Jeff Long		   long at kestrel.cc.ukans.edu
 Jeffery Von Ronne          jronne at ics.uci.edu
 Jens Bachem		   bachem at rrz.uni-koeln.de
+Jens Seidel                jensseidel at users.sf.net
 Jeroen C. van Gelderen     jeroen at vangelderen.org
 J Horacio MG		   homega at ciberia.es
 J. Michael Ashley          jashley at acm.org
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 8c9cefea6..38d264c5a 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-02  Werner Koch  <wk@g10code.com>
+
+	* gpg-agent.c (main): Run pth_kill after fork.  Fixes bug#1066.
+
 2009-05-19  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c (JNLIB_NEED_AFLOCAL): Define.
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 7093ee1e6..9eec9380a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -996,6 +996,9 @@ main (int argc, char **argv )
              right now and thus we restore it.  That is not strictly
              necessary but some programs falsely assume a cleared
              signal mask.  */
+          if ( !pth_kill () )
+            log_error ("pth_kill failed in foked process\n");
+            
 #ifdef HAVE_SIGPROCMASK
           if (startup_signal_mask_valid)
             {
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a876b6bb0..a03b11116 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-02  Werner Koch  <wk@g10code.com>
+
+	* tools.texi (watchgnupg): Typo fix.  Fixes bug#1065.
+
+	* gpg-agent.texi (Agent Commands): Update description of --daemon.
+
 2009-05-20  Werner Koch  <wk@g10code.com>
 
 	* gpg.texi (GPG Configuration Options): Explain new meaning of
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 16dd52197..27946c025 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -157,15 +157,17 @@ default mode is to create a socket and listen for commands there.
 
 @item --daemon [@var{command line}]
 @opindex daemon
-Run the program in the background.  This option is required to prevent
-it from being accidently running in the background.  A common way to do
-this is:
-@example
-@end example
-$ eval $(gpg-agent --daemon)
+Start the gpg-agent as a daemon; that is, detach it from the console
+and run it in the background.  Because @command{gpg-agent} prints out
+important information required for further use, a common way of
+invoking gpg-agent is: @code{eval $(gpg-agent --daemon)} to setup the
+environment variables.  The option @option{--write-env-file} is
+another way commonly used to do this.  Yet another way is creating
+a new process as a child of gpg-agent: @code{gpg-agent --daemon
+/bin/sh}.  This way you get a new shell with the environment setup
+properly; if you exit from this shell, gpg-agent terminates as well.
 @end table
 
-
 @mansect options
 @node Agent Options
 @section Option Summary
diff --git a/doc/tools.texi b/doc/tools.texi
index 506529065..fa794fc2b 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -41,7 +41,7 @@ GnuPG comes with a couple of smaller tools:
 @end ifset
 
 @mansect description
-Most of the main utilities are able to write there log files to a
+Most of the main utilities are able to write their log files to a
 Unix Domain socket if configured that way.  @command{watchgnupg} is a simple
 listener for such a socket.  It ameliorates the output with a time
 stamp and makes sure that long lines are not interspersed with log
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 623ea22e3..cbc4e778e 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-02  Werner Koch  <wk@g10code.com>
+
+	* card-util.c (get_manufacturer): Add new manufacturer.
+
 2009-05-26  Werner Koch  <wk@g10code.com>
 
 	* parse-packet.c (mpi_read): Workaround for zero-length MPI bug in
diff --git a/g10/card-util.c b/g10/card-util.c
index 7d36ebf9c..e12e4a7a1 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -193,6 +193,7 @@ get_manufacturer (unsigned int no)
     case 0x0002: return "Prism";
     case 0x0003: return "OpenFortress";
     case 0x0004: return "Wewid AB";
+    case 0x0005: return "ZeitControl";
 
       /* 0x00000 and 0xFFFF are defined as test cards per spec,
          0xFFF00 to 0xFFFE are assigned for use with randomly created
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 150d680a3..c59ef06ea 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27  Werner Koch  <wk@g10code.com>
+
+	* encrypt.c (encrypt_dek): Make use of make_canon_sexp.
+
 2009-05-18  Werner Koch  <wk@g10code.com>
 
 	* server.c (option_handler): New option "no-encrypt-to".
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 016e98fd5..a526a649e 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -207,22 +207,10 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, unsigned char **encval)
   gcry_sexp_release (s_data);
   gcry_sexp_release (s_pkey);
   
-  /* reformat it */
-  len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, NULL, 0);
-  assert (len); 
-  buf = xtrymalloc (len);
-  if (!buf)
-    {
-      gpg_error_t tmperr = out_of_core ();
-      gcry_sexp_release (s_ciph);
-      return tmperr;
-    }
-  len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, (char*)buf, len);
-  assert (len);
+  /* Reformat it. */
+  rc = make_canon_sexp (s_ciph, encval, NULL);
   gcry_sexp_release (s_ciph);
-
-  *encval = buf;
-  return 0;
+  return rc;
 }