Use XDG_RUNTIME_DIR for storing Xauthority

pull/330/head
Utkarsh Verma 3 years ago
parent 609b3f9ddc
commit 908ebf8964
No known key found for this signature in database
GPG Key ID: 817656CF818EFCCC

@ -304,10 +304,10 @@ void remove_utmp_entry(struct utmp *entry) {
endutent();
}
void xauth(const char* display_name, const char* shell, const char* dir)
void xauth(const char* display_name, const char* shell)
{
char xauthority[256];
snprintf(xauthority, 256, "%s/%s", dir, ".lyxauth");
snprintf(xauthority, 256, "%s/%s", getenv("XDG_RUNTIME_DIR"), "lyxauth");
setenv("XAUTHORITY", xauthority, 1);
setenv("DISPLAY", display_name, 1);
@ -343,18 +343,10 @@ void xorg(
const char* vt,
const char* desktop_cmd)
{
// generate xauthority file
const char* xauth_dir = getenv("XDG_CONFIG_HOME");
if ((xauth_dir == NULL) || (*xauth_dir == '\0'))
{
xauth_dir = pwd->pw_dir;
}
char display_name[4];
snprintf(display_name, 3, ":%d", get_free_display());
xauth(display_name, pwd->pw_shell, xauth_dir);
xauth(display_name, pwd->pw_shell);
// start xorg
pid_t pid = fork();
@ -531,7 +523,7 @@ void auth(
if (pwd->pw_shell[0] == '\0')
{
setusershell();
char* shell = getusershell();
if (shell != NULL)
@ -552,7 +544,7 @@ void auth(
if (pid == 0)
{
// set user info
// set user info
ok = initgroups(pwd->pw_name, pwd->pw_gid);
if (ok != 0)
@ -658,21 +650,21 @@ void auth(
// close pam session
ok = pam_do(pam_close_session, handle, 0, buf);
if (ok != PAM_SUCCESS)
{
return;
}
ok = pam_do(pam_setcred, handle, PAM_DELETE_CRED, buf);
if (ok != PAM_SUCCESS)
{
return;
}
ok = pam_end(handle, 0);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);

Loading…
Cancel
Save