diff options
| author | Werner Koch <[email protected]> | 2025-11-14 12:20:52 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2025-11-14 12:20:52 +0000 |
| commit | 94fa3c2b25a1979bb838c7d9f9f74375072f4efe (patch) | |
| tree | ecfb19643c75219380fe1d9b66816eb3b8c85533 /src/engine-gpgsm.c | |
| parent | doc: Add DCO for Chandler Davis (diff) | |
| download | gpgme-94fa3c2b25a1979bb838c7d9f9f74375072f4efe.tar.gz gpgme-94fa3c2b25a1979bb838c7d9f9f74375072f4efe.zip | |
* src/engine-gpg.c (gpg_new): Do not pass option --display if DISPLAY
is set to the empty string.
* src/engine-gpgsm.c (gpgsm_new): Likewiese for sending the display
option.
* src/engine-g13.c (g13_new): Ditto.
* src/engine-assuan.c (llass_new): Ditto.
* src/engine-uiserver.c (uiserver_new): Ditto.
--
GnuPG-bug-id: 7919
Diffstat (limited to 'src/engine-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index ff77c8fc..d464aeed 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -474,7 +474,7 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir, err = _gpgme_getenv ("DISPLAY", &dft_display); if (err) goto leave; - if (dft_display) + if (dft_display && *dft_display) { if (gpgrt_asprintf (&optstr, "OPTION display=%s", dft_display) < 0) { @@ -490,6 +490,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir, if (err) goto leave; } + else + free (dft_display); err = _gpgme_getenv ("GPG_TTY", &env_tty); if (isatty (1) || env_tty || err) |