From 9d62bacac7826cb73bb18fac7268f3d2df662d7b Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 3 Sep 2016 19:06:36 -0400 Subject: core: Check for GPG_TTY as well as DISPLAY. * src/engine-assuan.c (llass_new): Update --ttyname from GPG_TTY. * src/engine-g13.c (g13_new): Ditto. * src/engine-gpg.c (gpg_new): Ditto. * src/engine-uiserver.c (uiserver_new): Ditto. * src/engine-gpgsm.c (gpgsm_new): Ditto. -- Useful when no DISPLAY is set and there is no attached terminal to the current process. Signed-off-by: Ben Kibbey --- src/engine-assuan.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/engine-assuan.c') diff --git a/src/engine-assuan.c b/src/engine-assuan.c index f5e202a9..65924eb2 100644 --- a/src/engine-assuan.c +++ b/src/engine-assuan.c @@ -219,6 +219,7 @@ llass_new (void **engine, const char *file_name, const char *home_dir, gpgme_error_t err = 0; engine_llass_t llass; char *optstr; + char *env_tty = NULL; (void)version; /* Not yet used. */ @@ -280,13 +281,24 @@ llass_new (void **engine, const char *file_name, const char *home_dir, } } - if (llass->opt.gpg_agent && isatty (1)) + if (llass->opt.gpg_agent) + err = _gpgme_getenv ("GPG_TTY", &env_tty); + + if (llass->opt.gpg_agent && (isatty (1) || env_tty || err)) { - int rc; + int rc = 0; char dft_ttyname[64]; char *dft_ttytype = NULL; - rc = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)); + if (err) + goto leave; + else if (env_tty) + { + snprintf (dft_ttyname, sizeof (dft_ttyname), "%s", env_tty); + free (env_tty); + } + else + rc = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)); /* Even though isatty() returns 1, ttyname_r() may fail in many ways, e.g., when /dev/pts is not accessible under chroot. */ -- cgit v1.2.3