[git] GnuPG - branch, master, updated. gnupg-2.1.8-73-g7faf45e

[by Werner Koch]

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  7faf45effcd47d2d04d35090a1e01a1dbb99ec70 (commit)
      from  d5b4b4d9c16cb42331aa379755038fd5abf0f2d0 (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 7faf45effcd47d2d04d35090a1e01a1dbb99ec70
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 6 13:55:38 2015 +0200

    dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
    
    * dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
    (cmd_reloaddirmngr): Use check_owner_permission.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 5400a98..63a5cd8 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2120,6 +2120,7 @@ cmd_killdirmngr (assuan_context_t ctx, char *line)
   if (!err)
     {
       ctrl->server_local->stopme = 1;
+      assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
       err = gpg_error (GPG_ERR_EOF);
     }
   return err;
@@ -2141,14 +2142,12 @@ cmd_reloaddirmngr (assuan_context_t ctx, char *line)
     {
 #ifndef HAVE_W32_SYSTEM
       {
-        gpg_err_code_t ec;
-        assuan_peercred_t cred;
-
-        ec = gpg_err_code (assuan_get_peercred (ctx, &cred));
-        if (!ec && cred->uid)
-          ec = GPG_ERR_EPERM; /* Only root may terminate.  */
-        if (ec)
-          return set_error (ec, "no permission to reload this process");
+        gpg_error_t err;
+
+        err = check_owner_permission (ctx,
+                                      "no permission to reload this process");
+        if (err)
+          return err;
       }
 #endif
     }

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

Summary of changes:
 dirmngr/server.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


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