RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from UtkarshVerma/xdg 

Use XDG_RUNTIME_DIR for storing Xauthority
This commit is contained in:
ShiningLea 2022-06-03 10:16:37 +02:00 committed by GitHub
parent e158bb5e9d 38aacc6b1c
commit 9364ffcea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/login.c
View File

@ -300,10 +300,31 @@ void remove_utmp_entry(struct utmp *entry) {
endutent(); endutent();
} }
void xauth(const char* display_name, const char* shell, const char* dir) void xauth(const char* display_name, const char* shell, char* pwd)
{ {
const char* xauth_file = ".lyxauth";
char* xauth_dir = getenv("XDG_RUNTIME_DIR");
if ((xauth_dir == NULL) || (*xauth_dir == '\0'))
{
xauth_dir = getenv("XDG_CONFIG_DIR");
if ((xauth_dir == NULL) || (*xauth_dir == '\0'))
{
xauth_dir = pwd;
xauth_file = "lyxauth";
}
}
else
{
xauth_file = "lyxauth";
}
// trim trailing slashes
int i = strlen(xauth_dir) - 1;
while (xauth_dir[i] == '/') i--;
xauth_dir[i + 1] = '\0';
char xauthority[256]; char xauthority[256];
snprintf(xauthority, 256, "%s/%s", dir, ".lyxauth"); snprintf(xauthority, 256, "%s/%s", xauth_dir, xauth_file);
setenv("XAUTHORITY", xauthority, 1); setenv("XAUTHORITY", xauthority, 1);
setenv("DISPLAY", display_name, 1); setenv("DISPLAY", display_name, 1);
@ -339,18 +360,10 @@ void xorg(
const char* vt, const char* vt,
const char* desktop_cmd) 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]; char display_name[4];
snprintf(display_name, 3, ":%d", get_free_display()); snprintf(display_name, 3, ":%d", get_free_display());
xauth(display_name, pwd->pw_shell, xauth_dir); xauth(display_name, pwd->pw_shell, pwd->pw_dir);
// start xorg // start xorg
pid_t pid = fork(); pid_t pid = fork();
@ -530,7 +543,7 @@ void auth(
if (pwd->pw_shell[0] == '\0') if (pwd->pw_shell[0] == '\0')
{ {
setusershell(); setusershell();
char* shell = getusershell(); char* shell = getusershell();
if (shell != NULL) if (shell != NULL)
@ -551,7 +564,7 @@ void auth(
if (pid == 0) if (pid == 0)
{ {
// set user info // set user info
ok = initgroups(pwd->pw_name, pwd->pw_gid); ok = initgroups(pwd->pw_name, pwd->pw_gid);
if (ok != 0) if (ok != 0)
@ -657,21 +670,21 @@ void auth(
// close pam session // close pam session
ok = pam_do(pam_close_session, handle, 0, buf); ok = pam_do(pam_close_session, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
return; return;
} }
ok = pam_do(pam_setcred, handle, PAM_DELETE_CRED, buf); ok = pam_do(pam_setcred, handle, PAM_DELETE_CRED, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
return; return;
} }
ok = pam_end(handle, 0); ok = pam_end(handle, 0);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf); pam_diagnose(ok, buf);