diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-05-26 07:44:11 -0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-05-27 12:36:06 +0000 |
| commit | dba2bf943254bc7bdf4645f095502957c19cdc32 (patch) | |
| tree | 53993f386dc46a5e93a243a3b92a9367b060a783 | |
| parent | bbc049481e2461a83dfc7b653d01c08846e6421f (diff) | |
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>
(cherry picked from commit 8495b425bd056d405704df9e756560942d6815c1)
| -rw-r--r-- | vtysh/vtysh_user.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c index 1ed284809e..50b32dec02 100644 --- a/vtysh/vtysh_user.c +++ b/vtysh/vtysh_user.c @@ -57,7 +57,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. */ @@ -71,15 +71,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); } |