From e3e3b06fbdb917eaff24e1a6860654b99b99faa0 Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Sat, 11 Nov 2023 12:02:04 +0100 Subject: libpam: simplify IF_NO_PAMH The first argument of IF_NO_PAMH is supposed to be the name of the function which was called with pamh being NULL. With __FUNCTION__ the name can be inserted automatically by the compiler which is also already done with D macro. Fixes a bug in which _pam_drop_env erroneously logs with the function name _pam_make_env. Signed-off-by: Tobias Stoeckmann --- libpam/pam_auth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpam/pam_auth.c') diff --git a/libpam/pam_auth.c b/libpam/pam_auth.c index 92ef1ae7..8ad925ed 100644 --- a/libpam/pam_auth.c +++ b/libpam/pam_auth.c @@ -17,7 +17,7 @@ int pam_authenticate(pam_handle_t *pamh, int flags) D(("pam_authenticate called")); - IF_NO_PAMH("pam_authenticate", pamh, PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh, PAM_SYSTEM_ERR); if (__PAM_FROM_MODULE(pamh)) { D(("called from module!?")); @@ -54,7 +54,7 @@ int pam_setcred(pam_handle_t *pamh, int flags) D(("pam_setcred called")); - IF_NO_PAMH("pam_setcred", pamh, PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh, PAM_SYSTEM_ERR); if (__PAM_FROM_MODULE(pamh)) { D(("called from module!?")); -- cgit v1.2.3