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

vtysh: Give actual pam error messages 

Code was was written where the pam error message put out
was the result from a previous call to the pam modules
instead of the current call to the pam module.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-05-26 07:44:11 -04:00
parent 145acbb3bb
commit 8495b425bd
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);
}