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_handlers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libpam/pam_handlers.c') diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c index 6c91c193..fdc2b8a3 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c @@ -392,7 +392,7 @@ int _pam_init_handlers(pam_handle_t *pamh) int retval; D(("called.")); - IF_NO_PAMH("_pam_init_handlers",pamh,PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh,PAM_SYSTEM_ERR); /* Return immediately if everything is already loaded */ if (pamh->handlers.handlers_loaded) { @@ -796,7 +796,7 @@ int _pam_add_handler(pam_handle_t *pamh int mod_type = PAM_MT_FAULTY_MOD; D(("called.")); - IF_NO_PAMH("_pam_add_handler",pamh,PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh,PAM_SYSTEM_ERR); D(("adding type %d, handler_type %d, module `%s'", type, handler_type, mod_path)); @@ -954,7 +954,7 @@ int _pam_free_handlers(pam_handle_t *pamh) struct loaded_module *mod; D(("called.")); - IF_NO_PAMH("_pam_free_handlers",pamh,PAM_SYSTEM_ERR); + IF_NO_PAMH(pamh,PAM_SYSTEM_ERR); mod = pamh->handlers.module; -- cgit v1.2.3