diff options
| author | Marcus Brinkmann <[email protected]> | 2010-06-10 15:26:03 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2010-06-10 15:26:03 +0000 |
| commit | fd5193ac8c695701fe6fb48c271414347af8449e (patch) | |
| tree | cfe9a2906234ded7e25ba84155d2cd22da5c5f27 | |
| parent | common/ (diff) | |
| download | gnupg-fd5193ac8c695701fe6fb48c271414347af8449e.tar.gz gnupg-fd5193ac8c695701fe6fb48c271414347af8449e.zip | |
2010-06-10 Marcus Brinkmann <[email protected]>
* server.c (SERVER_STDIN, SERVER_STDOUT): New macros.
(gpgsm_server): Use them with assuan_fdopen.
| -rw-r--r-- | common/ChangeLog | 4 | ||||
| -rw-r--r-- | common/estream.c | 2 | ||||
| -rw-r--r-- | sm/ChangeLog | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 849d1def9..f46b4bb7d 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2010-06-10 Marcus Brinkmann <[email protected]> + + * estream.c (_es_get_std_stream): Fix cut&paste bug. + 2010-06-09 Werner Koch <[email protected]> * exechelp-posix.c, exechelp-w32.c diff --git a/common/estream.c b/common/estream.c index 56e362d68..bf7955d06 100644 --- a/common/estream.c +++ b/common/estream.c @@ -2452,7 +2452,7 @@ _es_get_std_stream (int fd) 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) { diff --git a/sm/ChangeLog b/sm/ChangeLog index 3919fe963..1b836b797 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,8 @@ +2010-06-10 Marcus Brinkmann <[email protected]> + + * server.c (SERVER_STDIN, SERVER_STDOUT): New macros. + (gpgsm_server): Use them with assuan_fdopen. + 2010-04-23 Marcus Brinkmann <[email protected]> * certreqgen.c (read_parameters): Use ascii_isspace instead of |