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

wrap pam actions and handle errors at on spot

This commit is contained in:
Stanislav Laznicka 2019-10-04 13:09:28 +02:00
parent b558473512
commit 63d207e2fc
No known key found for this signature in database
GPG Key ID: C98C414936B1A7F3
1 changed files with 25 additions and 19 deletions
Show Stats 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); 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( void auth(
struct desktop* desktop, struct desktop* desktop,
struct text* login, struct text* login,
@ -445,39 +463,31 @@ void auth(
return; return;
} }
ok = pam_authenticate(handle, 0); ok = pam_do(pam_authenticate, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
ok = pam_acct_mgmt(handle, 0); ok = pam_do(pam_acct_mgmt, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
ok = pam_setcred(handle, PAM_ESTABLISH_CRED); ok = pam_do(pam_setcred, handle, PAM_ESTABLISH_CRED, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
ok = pam_open_session(handle, 0); ok = pam_do(pam_open_session, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
@ -621,21 +631,17 @@ void auth(
desktop_load(desktop); desktop_load(desktop);
// close pam session // close pam session
ok = pam_close_session(handle, 0); ok = pam_do(pam_close_session, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
ok = pam_setcred(handle, PAM_DELETE_CRED); ok = pam_do(pam_setcred, handle, PAM_DELETE_CRED, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
{ {
pam_diagnose(ok, buf);
pam_end(handle, ok);
return; return;
} }
@ -645,4 +651,4 @@ void auth(
{ {
pam_diagnose(ok, buf); pam_diagnose(ok, buf);
} }
} }