Page MenuHome GnuPG
Files F26765827

D157.id.diff
No OneTemporary
Actions

D157.id.diff
View Options

Index: new/common/session-env.c
===================================================================
--- new/common/session-env.c
+++ new/common/session-env.c
@@ -328,8 +328,12 @@
/* Get the default value with and additional fallback for GPG_TTY. */
defvalue = getenv (name);
- if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY") && ttyname (0))
- defvalue = ttyname (0);
+ if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY"))
+ {
+ defvalue = ttyname (0);
+ if (!defvalue)
+ defvalue = "/dev/tty";
+ }
if (defvalue)
{
/* Record the default value for later use so that we are safe
Index: new/common/simple-pwquery.c
===================================================================
--- new/common/simple-pwquery.c
+++ new/common/simple-pwquery.c
@@ -224,7 +224,11 @@
dft_ttyname = getenv ("GPG_TTY");
#ifndef HAVE_W32_SYSTEM
if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
- dft_ttyname = ttyname (0);
+ {
+ dft_ttyname = ttyname (0);
+ if (!dft_ttyname)
+ dft_ttyname = "/dev/tty";
+ }
#endif
if (dft_ttyname && *dft_ttyname)
{

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 5, 8:24 PM (7 h, 45 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f8/17/68cb3d1707a424897b28efd6b2c9

Event Timeline