diff options
author | Werner Koch <[email protected]> | 2024-02-27 09:35:46 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2024-02-27 09:36:22 +0000 |
commit | 962058f704867082d6d00f6467a79c78e41169ca (patch) | |
tree | 4cdb21422cdd037add8db508644ac39483cc8264 /g10/gpg.c | |
parent | agent: Allow GET_PASSPHRASE in restricted mode. (diff) | |
download | gnupg-962058f704867082d6d00f6467a79c78e41169ca.tar.gz gnupg-962058f704867082d6d00f6467a79c78e41169ca.zip |
Allow tilde expansion for the foo-program options.
* agent/gpg-agent.c (parse_rereadable_options): Use make_filename_try
for opt.pinentry_program. Change definition accordingly.
* g10/gpg.c (main): Use make_filename for agent_program,
dirmngr_program, and keyboxd_program. Change definition accordingly.
* sm/gpgsm.c (main): Ditto.
* tools/gpg-card.c (parse_arguments): Ditto.
* tools/gpg-connect-agent.c (main): Ditto.
* tools/gpg-wks-client.c (parse_arguments): Likewise. Do it also for
option --output.
(process_confirmation_request): Print a note for a successful sent.
--
GnuPG-bug-id: 7017
Diffstat (limited to 'g10/gpg.c')
-rw-r--r-- | g10/gpg.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -3592,9 +3592,18 @@ main (int argc, char **argv) case oPersonalCompressPreferences: pers_compress_list=pargs.r.ret_str; break; - case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; - case oKeyboxdProgram: opt.keyboxd_program = pargs.r.ret_str; break; - case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break; + case oAgentProgram: + xfree (opt.agent_program); + opt.agent_program = make_filename (pargs.r.ret_str, NULL); + break; + case oKeyboxdProgram: + xfree (opt.keyboxd_program); + opt.keyboxd_program = make_filename (pargs.r.ret_str, NULL); + break; + case oDirmngrProgram: + xfree (opt.dirmngr_program); + opt.dirmngr_program = make_filename (pargs.r.ret_str, NULL); + break; case oDisableDirmngr: opt.disable_dirmngr = 1; break; case oWeakDigest: additional_weak_digest(pargs.r.ret_str); |