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

Fixes segfault when environment does not set LANG

This commit is contained in:
Adam Christiansen 2020-03-22 16:38:24 -06:00
parent eb496b0db5
commit 2442599486
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/login.c
View File

@ -227,7 +227,10 @@ void env_init(struct passwd* pwd)
setenv("SHELL", pwd->pw_shell, 1); setenv("SHELL", pwd->pw_shell, 1);
setenv("USER", pwd->pw_name, 1); setenv("USER", pwd->pw_name, 1);
setenv("LOGNAME", pwd->pw_name, 1); setenv("LOGNAME", pwd->pw_name, 1);
setenv("LANG", lang, 1); if (lang != NULL)
{
setenv("LANG", lang, 1);
}
// Set PATH if specified in the configuration // Set PATH if specified in the configuration
if (strlen(config.path)) if (strlen(config.path))
@ -530,7 +533,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 +554,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,24 +660,23 @@ 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);
} }
} }