diff options
| author | Tobias Stoeckmann <tobias@stoeckmann.org> | 2023-11-11 12:02:04 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-11-12 19:20:21 +0000 |
| commit | e3e3b06fbdb917eaff24e1a6860654b99b99faa0 (patch) | |
| tree | 44fd0f521a029e3d794137f749f834c570e333f8 /libpam/pam_env.c | |
| parent | 3f6189918f088e353119944e24fe1f725ee502a7 (diff) | |
| download | pam-e3e3b06fbdb917eaff24e1a6860654b99b99faa0.tar.gz pam-e3e3b06fbdb917eaff24e1a6860654b99b99faa0.tar.bz2 pam-e3e3b06fbdb917eaff24e1a6860654b99b99faa0.zip | |
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 <tobias@stoeckmann.org>
Diffstat (limited to 'libpam/pam_env.c')
| -rw-r--r-- | libpam/pam_env.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpam/pam_env.c b/libpam/pam_env.c index 54fe2dea..276f3d1e 100644 --- a/libpam/pam_env.c +++ b/libpam/pam_env.c @@ -56,7 +56,7 @@ int _pam_make_env(pam_handle_t *pamh) { D(("called.")); - IF_NO_PAMH("_pam_make_env", pamh, PAM_ABORT); + IF_NO_PAMH(pamh, PAM_ABORT); /* * get structure memory @@ -99,7 +99,7 @@ int _pam_make_env(pam_handle_t *pamh) void _pam_drop_env(pam_handle_t *pamh) { D(("called.")); - IF_NO_PAMH("_pam_make_env", pamh, /* nothing to return */); + IF_NO_PAMH(pamh, /* nothing to return */); if (pamh->env != NULL) { int i; @@ -162,7 +162,7 @@ int pam_putenv(pam_handle_t *pamh, const char *name_value) int item, retval; D(("called.")); - IF_NO_PAMH("pam_putenv", pamh, PAM_ABORT); + IF_NO_PAMH(pamh, PAM_ABORT); if (name_value == NULL) { pam_syslog(pamh, LOG_ERR, "pam_putenv: no variable indicated"); @@ -295,7 +295,7 @@ const char *pam_getenv(pam_handle_t *pamh, const char *name) int item; D(("called.")); - IF_NO_PAMH("pam_getenv", pamh, NULL); + IF_NO_PAMH(pamh, NULL); if (name == NULL) { pam_syslog(pamh, LOG_ERR, "pam_getenv: no variable indicated"); @@ -368,7 +368,7 @@ char **pam_getenvlist(pam_handle_t *pamh) int i; D(("called.")); - IF_NO_PAMH("pam_getenvlist", pamh, NULL); + IF_NO_PAMH(pamh, NULL); if (pamh->env == NULL || pamh->env->list == NULL) { pam_syslog(pamh, LOG_ERR, "pam_getenvlist: no env%s found", |