[git] GnuPG - branch, master, updated. gnupg-2.1.20-3-g685438b

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  685438bf6fe78c38919031a6ae35576ece7f47cf (commit)
       via  5744d2038bd17b8b1be4e73d0ad3bc41772efe96 (commit)
      from  943176c73208f1484de8b0c34b2ad1d189e88495 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 685438bf6fe78c38919031a6ae35576ece7f47cf
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 4 10:48:09 2017 +0900

    po: Update Japanese translation.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/po/ja.po b/po/ja.po
index 02c3b64..ae180b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.1.16\n"
+"Project-Id-Version: gnupg 2.1.20\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2016-12-17 16:29+0900\n"
+"PO-Revision-Date: 2017-04-04 10:45+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -2135,7 +2135,7 @@ msgid "show revoked and expired user IDs in signature verification"
 msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
 
 msgid "show only the primary user ID in signature verification"
-msgstr "署名の検証時に主なユーザIDだけをを表示する"
+msgstr "署名の検証時にプライマリ・ユーザIDだけをを表示する"
 
 msgid "validate signatures with PKA data"
 msgstr "PKAデータで署名を検証する"
@@ -3242,20 +3242,16 @@ msgstr "更新に失敗しました: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "鍵は無変更なので更新は不要です。\n"
 
-#, fuzzy
-#| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
-msgstr "最後のユーザIDは削除できません!\n"
+msgstr "最後の有効なユーザIDは失効できません。\n"
 
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#, c-format
 msgid "revoking the user ID failed: %s\n"
-msgstr "信用リストの検査に失敗しました: %s\n"
+msgstr "ユーザIDの失効に失敗しました: %s\n"
 
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#, c-format
 msgid "setting the primary user ID failed: %s\n"
-msgstr "信用リストの検査に失敗しました: %s\n"
+msgstr "プライマリ・ユーザIDの設定に失敗しました: %s\n"
 
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
@@ -3573,10 +3569,8 @@ msgstr "ユーザID\"%s\"は、もう失効されています\n"
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
 
-#, fuzzy
-#| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
-msgstr "最後のユーザIDは削除できません!\n"
+msgstr "最後の有効なユーザIDは失効できません。\n"
 
 #, c-format
 msgid "Key %s is already revoked.\n"

commit 5744d2038bd17b8b1be4e73d0ad3bc41772efe96
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 4 10:39:00 2017 +0900

    agent: Minor fix for get_client_pid.
    
    * agent/command-ssh.c (get_client_pid): Use 0 to initialize.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 5a02542..b15d8b2 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3567,7 +3567,7 @@ ssh_request_process (ctrl_t ctrl, estream_t stream_sock)
 static unsigned long
 get_client_pid (int fd)
 {
-  pid_t client_pid = (pid_t)(-1);
+  pid_t client_pid = (pid_t)0;
 
 #ifdef SO_PEERCRED
   {
@@ -3578,7 +3578,7 @@ get_client_pid (int fd)
 #endif
     socklen_t cl = sizeof cr;
 
-    if ( !getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl))
+    if (!getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl))
       {
 #if defined (HAVE_STRUCT_SOCKPEERCRED_PID) || defined (HAVE_STRUCT_UCRED_PID)
         client_pid = cr.pid;
@@ -3593,7 +3593,7 @@ get_client_pid (int fd)
   {
     socklen_t len = sizeof (pid_t);
 
-    getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &client_pid, &len);
+    getsockopt (fd, SOL_LOCAL, LOCAL_PEERPID, &client_pid, &len);
   }
 #elif defined (LOCAL_PEEREID)
   {
@@ -3613,9 +3613,11 @@ get_client_pid (int fd)
         ucred_free (ucred);
       }
   }
+#else
+  (void)fd;
 #endif
 
-  return client_pid == (pid_t)(-1)? 0 : (unsigned long)client_pid;
+  return (unsigned long)client_pid;
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 agent/command-ssh.c | 10 ++++++----
 po/ja.po            | 24 +++++++++---------------
 2 files changed, 15 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org