diff --git a/agent/ChangeLog b/agent/ChangeLog index 92b713164..a2e878db6 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2009-03-25 Werner Koch + + * gpg-agent.c (main): Print a started message to show the real pid. + 2009-03-20 Werner Koch * learncard.c (struct kpinfo_cp_parm_s): Add field CTRL. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index e5372c4f9..b5f9a47e2 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -467,6 +467,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) || strcmp (current_logfile, pargs->r.ret_str)) { log_set_file (pargs->r.ret_str); + assuan_set_assuan_log_stream (log_get_stream ()); xfree (current_logfile); current_logfile = xtrystrdup (pargs->r.ret_str); } @@ -980,9 +981,10 @@ main (int argc, char **argv ) else if (pid) { /* We are the parent */ char *infostr, *infostr_ssh_sock, *infostr_ssh_pid; - + + /* Close the socket FD. */ close (fd); - + /* Note that we used a standard fork so that Pth runs in both the parent and the child. The pth_fork would terminate Pth in the child but that is not the way we @@ -1184,6 +1186,7 @@ main (int argc, char **argv ) } #endif /*!HAVE_W32_SYSTEM*/ + log_info ("%s %s started\n", strusage(11), strusage(13) ); handle_connections (fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); assuan_sock_close (fd); } diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 05c8e98a5..8c12f5fc5 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,8 @@ +2009-03-25 Werner Koch + + * logging.c (fun_closer): Never close fd 2. + (set_file_fd): Close logstream early. + 2009-02-25 Werner Koch * logging.c (get_tid_callback): New. diff --git a/jnlib/logging.c b/jnlib/logging.c index b06361980..fb41b45ef 100644 --- a/jnlib/logging.c +++ b/jnlib/logging.c @@ -218,7 +218,7 @@ fun_closer (void *cookie_arg) { struct fun_cookie_s *cookie = cookie_arg; - if (cookie->fd != -1) + if (cookie->fd != -1 && cookie->fd != 2) close (cookie->fd); jnlib_free (cookie); log_socket = -1; @@ -239,6 +239,15 @@ set_file_fd (const char *name, int fd) struct fun_cookie_s *cookie; #endif + /* Close an open log stream. */ + if (logstream) + { + if (logstream != stderr && logstream != stdout) + fclose (logstream); + logstream = NULL; + } + + /* Figure out what kind of logging we want. */ if (name && !strcmp (name, "-")) { name = NULL; @@ -256,6 +265,7 @@ set_file_fd (const char *name, int fd) want_socket = 0; } + /* Setup a new stream. */ #ifdef USE_FUNWRITER cookie = jnlib_xmalloc (sizeof *cookie + (name? strlen (name):0)); strcpy (cookie->name, name? name:""); @@ -310,15 +320,7 @@ set_file_fd (const char *name, int fd) #endif /*!USE_FUNWRITER*/ - /* On success close the old logstream right now, so that we are - really sure it has been closed. */ - if (fp && logstream) - { - if (logstream != stderr && logstream != stdout) - fclose (logstream); - logstream = NULL; - } - + /* On error default to stderr. */ if (!fp) { if (name) @@ -333,8 +335,6 @@ set_file_fd (const char *name, int fd) else setvbuf (fp, NULL, _IOLBF, 0); - if (logstream && logstream != stderr && logstream != stdout) - fclose (logstream); logstream = fp; /* We always need to print the prefix and the pid for socket mode, diff --git a/jnlib/t-support.c b/jnlib/t-support.c index 126104846..756c54c7f 100644 --- a/jnlib/t-support.c +++ b/jnlib/t-support.c @@ -120,6 +120,7 @@ gcry_free (void *a) int gpg_err_code_from_errno (int err) { + (void)err; assert (!"stub function"); return -1; } diff --git a/po/be.po b/po/be.po index cc33cadfc..af9989008 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" diff --git a/po/ca.po b/po/ca.po index f1e87b20f..83f875ab1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 94ef96240..fd15acc3e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index afdfeed6b..3f862dd68 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 38beff522..2a81f7ddb 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-2.0.10\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2009-03-24 18:54+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" diff --git a/po/el.po b/po/el.po index 30d06b272..48fcc88b8 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" diff --git a/po/eo.po b/po/eo.po index 298da7b37..b0ec0344c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 4ef58ffa1..72af57990 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 2.0.9\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-12-14 19:34+0100\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" diff --git a/po/et.po b/po/et.po index 464548e39..3e66a8a6a 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" diff --git a/po/fi.po b/po/fi.po index ca711b926..d29df9f1a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 49d912477..318c4809f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-09-30 19:38+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 3ddd79ffa..92bc27c54 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" diff --git a/po/hu.po b/po/hu.po index 07a9fe4da..462d991b1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index 410a4a66d..aca02557a 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" diff --git a/po/it.po b/po/it.po index 1c9434739..f4b09539a 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-05-26 12:02+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 58434e064..a130650f6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" diff --git a/po/nb.po b/po/nb.po index aa990c8a9..528f3c201 100644 --- a/po/nb.po +++ b/po/nb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian Bokmål \n" diff --git a/po/pl.po b/po/pl.po index 0a2d00341..a86df30a5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-2.0.7\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2007-11-26 19:01+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 51ba5be1d..386e58291 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index cf4b8ed1a..ee221ea5d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2007-08-16 11:35+0200\n" "Last-Translator:\n" "Language-Team: ?\n" diff --git a/po/ro.po b/po/ro.po index d78774c12..f39c010ac 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index 56e4aa6d4..28acc98b8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 2.0.10\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-12-21 00:40+0200\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index cb3460f14..b78323b51 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" diff --git a/po/sv.po b/po/sv.po index 7929bce09..77314c329 100644 --- a/po/sv.po +++ b/po/sv.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg trunk\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-07-21 09:04+0200\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index fc745d47f..70feb66eb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 2.0.10rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-12-14 23:25+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index f2053e3c8..9ef10c501 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2006-07-02 10:58+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0734c30e6..f02fc1674 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 2.0.10rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2009-03-24 18:42+0100\n" +"POT-Creation-Date: 2009-03-24 18:56+0100\n" "PO-Revision-Date: 2008-12-10 22:48+0800\n" "Last-Translator: Jedi Lin \n" "Language-Team: Chinese (traditional) \n"