Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #13608 from donaldsharp/pam_wrong 

vtysh: Give actual pam error messages
This commit is contained in:
Donatas Abraitis 2023-05-27 15:35:25 +03:00 committed by GitHub
parent 618a9f0592 8495b425bd
commit 607c84f406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtysh/vtysh_user.c
View File

@ -42,7 +42,7 @@ static struct pam_conv conv = {PAM_CONV_FUNC, NULL};
static int vtysh_pam(const char *user)
{
int ret;
int ret, second_ret;
pam_handle_t *pamh = NULL;
/* Start PAM. */
@ -56,15 +56,18 @@ static int vtysh_pam(const char *user)
fprintf(stderr, "vtysh_pam: Failure to initialize pam: %s(%d)",
pam_strerror(pamh, ret), ret);
if (pam_acct_mgmt(pamh, 0) != PAM_SUCCESS)
second_ret = pam_acct_mgmt(pamh, 0);
if (second_ret != PAM_SUCCESS)
fprintf(stderr, "%s: Failed in account validation: %s(%d)",
__func__, pam_strerror(pamh, ret), ret);
__func__, pam_strerror(pamh, second_ret), second_ret);
/* close Linux-PAM */
if (pam_end(pamh, ret) != PAM_SUCCESS) {
second_ret = pam_end(pamh, ret);
if (second_ret != PAM_SUCCESS) {
pamh = NULL;
fprintf(stderr, "vtysh_pam: failed to release authenticator: %s(%d)\n",
pam_strerror(pamh, ret), ret);
fprintf(stderr,
"vtysh_pam: failed to release authenticator: %s(%d)\n",
pam_strerror(pamh, second_ret), second_ret);
exit(1);
}