diff options
| author | Werner Koch <[email protected]> | 2018-03-27 06:48:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-27 06:48:00 +0000 |
| commit | d4dc4245bf0221d2db4118718fc2528ecf43b97b (patch) | |
| tree | 5912abc9b9ba056a882bcd933105ba4dde73c560 /sm/server.c | |
| parent | Change license of argparse.c back to LGPLv2.1 (diff) | |
| parent | agent: Make the request origin a part of the cache items. (diff) | |
| download | gnupg-d4dc4245bf0221d2db4118718fc2528ecf43b97b.tar.gz gnupg-d4dc4245bf0221d2db4118718fc2528ecf43b97b.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Diffstat (limited to 'sm/server.c')
| -rw-r--r-- | sm/server.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sm/server.c b/sm/server.c index 721f3faf0..98505e26d 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); |