diff options
| author | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
| commit | 4ef62278e3c9406360dc50288f422291497e218f (patch) | |
| tree | fff3a49be5c2659ab87195e5b0a4f88e51a49205 /g10/server.c | |
| parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
| parent | gpg: New option --mimemode. (diff) | |
| download | gnupg-4ef62278e3c9406360dc50288f422291497e218f.tar.gz gnupg-4ef62278e3c9406360dc50288f422291497e218f.zip | |
Merge branch 'master' into STABLE-BRANCH-2-2
--
Diffstat (limited to '')
| -rw-r--r-- | g10/server.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/server.c b/g10/server.c index 771a8a7a9..258f08a5d 100644 --- a/g10/server.c +++ b/g10/server.c @@ -177,6 +177,7 @@ output_notify (assuan_context_t ctx, char *line) /* RECIPIENT [--hidden] <userID> + RECIPIENT [--hidden] --file <filename> Set the recipient for the encryption. <userID> should be the internal representation of the key; the server may accept any other @@ -192,9 +193,10 @@ cmd_recipient (assuan_context_t ctx, char *line) { ctrl_t ctrl = assuan_get_pointer (ctx); gpg_error_t err; - int hidden; + int hidden, file; hidden = has_option (line,"--hidden"); + file = has_option (line,"--file"); line = skip_options (line); /* FIXME: Expand groups @@ -204,7 +206,7 @@ cmd_recipient (assuan_context_t ctx, char *line) remusr = rcpts; */ - err = find_and_check_key (ctrl, line, PUBKEY_USAGE_ENC, hidden, + err = find_and_check_key (ctrl, line, PUBKEY_USAGE_ENC, hidden, file, &ctrl->server_local->recplist); if (err) |