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_data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libpam/pam_data.c') diff --git a/libpam/pam_data.c b/libpam/pam_data.c index 30570afb..c457d5ce 100644 --- a/libpam/pam_data.c +++ b/libpam/pam_data.c @@ -45,7 +45,7 @@ static struct pam_data *_pam_locate_data(const pam_handle_t *pamh, D(("called")); - IF_NO_PAMH("_pam_locate_data", pamh, NULL); + IF_NO_PAMH(pamh, NULL); data = pamh->data; @@ -69,7 +69,7 @@ int pam_set_data( D(("called")); - IF_NO_PAMH("pam_set_data", pamh, PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh, PAM_SYSTEM_ERR); if (__PAM_FROM_APP(pamh)) { D(("called from application!?")); @@ -122,7 +122,7 @@ int pam_get_data( D(("called")); - IF_NO_PAMH("pam_get_data", pamh, PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh, PAM_SYSTEM_ERR); if (__PAM_FROM_APP(pamh)) { D(("called from application!?")); @@ -151,7 +151,7 @@ void _pam_free_data(pam_handle_t *pamh, int status) D(("called")); - IF_NO_PAMH("_pam_free_data", pamh, /* no return value for void fn */); + IF_NO_PAMH(pamh, /* no return value for void fn */); data = pamh->data; while (data) { -- cgit v1.2.3