[svn] GnuPG - r5354 - in trunk: common sm

[svn author marcus]

Author: marcus
Date: 2010-06-10 17:26:03 +0200 (Thu, 10 Jun 2010)
New Revision: 5354

Modified:
   trunk/common/ChangeLog
   trunk/common/estream.c
   trunk/sm/ChangeLog
Log:
2010-06-10  Marcus Brinkmann  <marcus at g10code.de>

	* server.c (SERVER_STDIN, SERVER_STDOUT): New macros.
	(gpgsm_server): Use them with assuan_fdopen.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2010-06-10 15:08:29 UTC (rev 5353)
+++ trunk/common/ChangeLog	2010-06-10 15:26:03 UTC (rev 5354)
@@ -1,3 +1,7 @@
+2010-06-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* estream.c (_es_get_std_stream): Fix cut&paste bug.
+
 2010-06-09  Werner Koch  <wk at g10code.com>
 
 	* exechelp-posix.c, exechelp-w32.c

Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2010-06-10 15:08:29 UTC (rev 5353)
+++ trunk/sm/ChangeLog	2010-06-10 15:26:03 UTC (rev 5354)
@@ -1,3 +1,8 @@
+2010-06-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* server.c (SERVER_STDIN, SERVER_STDOUT): New macros.
+	(gpgsm_server): Use them with assuan_fdopen.
+
 2010-04-23  Marcus Brinkmann  <marcus at g10code.de>
 
 	* certreqgen.c (read_parameters): Use ascii_isspace instead of

Modified: trunk/common/estream.c
===================================================================
--- trunk/common/estream.c	2010-06-10 15:08:29 UTC (rev 5353)
+++ trunk/common/estream.c	2010-06-10 15:26:03 UTC (rev 5354)
@@ -2452,7 +2452,7 @@
       else if (fd == 1 && custom_std_fds_valid[1])
         stream = do_fdopen (custom_std_fds[1], "a", 1, 1);
       else if (custom_std_fds_valid[2])
-        stream = do_fdopen (custom_std_fds[1], "a", 1, 1);
+        stream = do_fdopen (custom_std_fds[2], "a", 1, 1);
       
       if (!stream)
         {