diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:24 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:24 +0900 |
| commit | 7c0714a17893a9adad202982ad5b70f69f00b195 (patch) | |
| tree | f5271889815ab9d162d1f4c2133010bc81eacdfe /tools | |
| parent | 5ce840383da7cf82ffa7dfaeda187f3fe3d591a7 (diff) | |
| download | gpg2-7c0714a17893a9adad202982ad5b70f69f00b195.tar.gz gpg2-7c0714a17893a9adad202982ad5b70f69f00b195.tar.bz2 gpg2-7c0714a17893a9adad202982ad5b70f69f00b195.zip | |
Imported Upstream version 2.1.23upstream/2.1.23
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-wks-client.c | 9 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 11 | ||||
| -rw-r--r-- | tools/rfc822parse.c | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c index 746aa53..594f28a 100644 --- a/tools/gpg-wks-client.c +++ b/tools/gpg-wks-client.c @@ -551,7 +551,14 @@ command_supported (char *userid) char *addrspec = NULL; char *submission_to = NULL; - addrspec = mailbox_from_userid (userid); + if (!strchr (userid, '@')) + { + char *tmp = xstrconcat ("foo@", userid, NULL); + addrspec = mailbox_from_userid (tmp); + xfree (tmp); + } + else + addrspec = mailbox_from_userid (userid); if (!addrspec) { log_error (_("\"%s\" is not a proper mail address\n"), userid); diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index cfc9fa3..b066dad 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -550,6 +550,9 @@ static gc_option_t gc_options_gpg_agent[] = GC_LEVEL_ADVANCED, "gnupg", "allow passphrase to be prompted through Emacs", GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, + { "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT, + "gnupg", NULL, + GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, { "no-allow-external-cache", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC, "gnupg", "disallow the use of an external password cache", GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, @@ -559,9 +562,6 @@ static gc_option_t gc_options_gpg_agent[] = { "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT, "gnupg", "disallow caller to override the pinentry", GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, - { "no-grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT, - "gnupg", "do not grab keyboard and mouse", - GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, { "Passphrase policy", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, @@ -757,6 +757,11 @@ static gc_option_t gc_options_gpg[] = GC_ARG_TYPE_STRING, GC_BACKEND_GPG }, { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, + { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, + NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, + { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, + "gnupg", N_("disable all access to the dirmngr"), + GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, GC_OPTION_NULL diff --git a/tools/rfc822parse.c b/tools/rfc822parse.c index ab692bd..e8cdb02 100644 --- a/tools/rfc822parse.c +++ b/tools/rfc822parse.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, see <https://www.gnu.org/licenses/>. -g */ + */ /* According to RFC822 binary zeroes are allowed at many places. We do |