[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-25-g137644c

[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, STABLE-BRANCH-2-2 has been updated
       via  137644c9cb58deaaba6850f2763d9c5f9241cb0b (commit)
      from  2cd35df5db3c4dfe37616dcfb1fcc644959449ef (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 137644c9cb58deaaba6850f2763d9c5f9241cb0b
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 23 15:07:56 2018 +0100

    sm: Add OPTION request-origin.
    
    * sm/server.c: Include shareddefs.h.
    (option_handler): Add option.
    --
    
    This is required when running gpgsm in server mode as done by GPGME.
    Noet that a command line option takes precedence.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/sm/server.c b/sm/server.c
index 721f3fa..98505e2 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -32,6 +32,7 @@
 #include "../common/sysutils.h"
 #include "../common/server-help.h"
 #include "../common/asshelp.h"
+#include "../common/shareddefs.h"
 
 #define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
 
@@ -289,6 +290,17 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
           ctrl->offline = i;
         }
     }
+  else if (!strcmp (key, "request-origin"))
+    {
+      if (!opt.request_origin)
+        {
+          int i = parse_request_origin (value);
+          if (i == -1)
+            err = gpg_error (GPG_ERR_INV_VALUE);
+          else
+            opt.request_origin = i;
+        }
+    }
   else
     err = gpg_error (GPG_ERR_UNKNOWN_OPTION);
 

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

Summary of changes:
 sm/server.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)


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