mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-21 19:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cosmetic changes + enter behavior (#126)

Browse Source 
* remove trailing whitespace

* always submit password on enter

Moves the keypress logic for keypresses from if-else statements
to switches, adds non-contextual behavior on pressing enter

* wrap pam actions and handle errors at on spot

* init all of text struct in input_text()

This gets rid off valgrind warning on unitialized variables
This commit is contained in:
Stanislav Láznička
2019-10-04 20:50:02 +02:00
committed by cylgom
parent 0b467a95b3
commit d839a92296
5 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/login.c
View File

@@ -423,6 +423,24 @@ void shell(struct passwd* pwd)
reset_terminal(pwd);
}
// pam_do performs the pam action specified in pam_action
// on pam_action fail, call diagnose and end pam session
int pam_do(
int (pam_action)(struct pam_handle *, int),
struct pam_handle *handle,
int flags,
struct term_buf *buf)
{
int status = pam_action(handle, flags);
if (status != PAM_SUCCESS) {
pam_diagnose(status, buf);
pam_end(handle, status);
}
return status;
}
void auth(
struct desktop* desktop,
struct text* login,
@@ -445,39 +463,31 @@ void auth(
return;
}
ok = pam_authenticate(handle, 0);
ok = pam_do(pam_authenticate, handle, 0, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
ok = pam_acct_mgmt(handle, 0);
ok = pam_do(pam_acct_mgmt, handle, 0, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
ok = pam_setcred(handle, PAM_ESTABLISH_CRED);
ok = pam_do(pam_setcred, handle, PAM_ESTABLISH_CRED, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
ok = pam_open_session(handle, 0);
ok = pam_do(pam_open_session, handle, 0, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
@@ -621,21 +631,17 @@ void auth(
desktop_load(desktop);
// close pam session
ok = pam_close_session(handle, 0);
ok = pam_do(pam_close_session, handle, 0, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
ok = pam_setcred(handle, PAM_DELETE_CRED);
ok = pam_do(pam_setcred, handle, PAM_DELETE_CRED, buf);
if (ok != PAM_SUCCESS)
{
pam_diagnose(ok, buf);
pam_end(handle, ok);
return;
}
@@ -645,4 +651,4 @@ void auth(
{
pam_diagnose(ok, buf);
}
}
}