View | Details | Raw Unified | Return to bug 36557
Collapse All | Expand All

(-)a/readpass.c (-2 / +2 lines)
Lines 140-149 read_passphrase(const char *prompt, int flags) Link Here
140
		}
140
		}
141
	}
141
	}
142
142
143
	if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL)
143
	if ((flags & RP_USE_ASKPASS) && (getenv("DISPLAY") == NULL || getenv("WAYLAND_DISPLAY") == NULL))
144
		return (flags & RP_ALLOW_EOF) ? NULL : xstrdup("");
144
		return (flags & RP_ALLOW_EOF) ? NULL : xstrdup("");
145
145
146
	if (use_askpass && getenv("DISPLAY")) {
146
	if (use_askpass && (getenv("DISPLAY") || getenv("WAYLAND_DISPLAY"))) {
147
		if (getenv(SSH_ASKPASS_ENV))
147
		if (getenv(SSH_ASKPASS_ENV))
148
			askpass = getenv(SSH_ASKPASS_ENV);
148
			askpass = getenv(SSH_ASKPASS_ENV);
149
		else
149
		else

Return to bug 36557