diff options
| author | ikerexxe <ipedrosa@redhat.com> | 2020-08-26 14:44:23 +0200 |
|---|---|---|
| committer | Tomáš Mráz <tmraz@redhat.com> | 2020-09-10 09:06:31 +0200 |
| commit | 6bf9b454eb971083f0cce49faa2aa1cde329ff5d (patch) | |
| tree | bdfc4ba0449c2f2cfaba5f2560e2a219238e05f0 /modules | |
| parent | e42e178c71c11bb25740a5177eed110ee17b8af2 (diff) | |
| download | pam-6bf9b454eb971083f0cce49faa2aa1cde329ff5d.tar.gz pam-6bf9b454eb971083f0cce49faa2aa1cde329ff5d.tar.bz2 pam-6bf9b454eb971083f0cce49faa2aa1cde329ff5d.zip | |
pam_wheel: improve coding style
modules/pam_wheel/pam_wheel.c: improve indentation and explicitly state
condition statements
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pam_wheel/pam_wheel.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/modules/pam_wheel/pam_wheel.c b/modules/pam_wheel/pam_wheel.c index a025ebaf..94cb7d89 100644 --- a/modules/pam_wheel/pam_wheel.c +++ b/modules/pam_wheel/pam_wheel.c @@ -130,25 +130,27 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group) } if (ctrl & PAM_USE_UID_ARG) { - tpwd = pam_modutil_getpwuid (pamh, getuid()); - if (!tpwd) { - if (ctrl & PAM_DEBUG_ARG) { + tpwd = pam_modutil_getpwuid (pamh, getuid()); + if (tpwd == NULL) { + if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_NOTICE, "who is running me ?!"); - } - return PAM_SERVICE_ERR; - } - fromsu = tpwd->pw_name; + } + return PAM_SERVICE_ERR; + } + fromsu = tpwd->pw_name; } else { - fromsu = pam_modutil_getlogin(pamh); - if (fromsu) { - tpwd = pam_modutil_getpwnam (pamh, fromsu); - } - if (!fromsu || !tpwd) { - if (ctrl & PAM_DEBUG_ARG) { - pam_syslog(pamh, LOG_NOTICE, "who is running me ?!"); - } - return PAM_SERVICE_ERR; - } + fromsu = pam_modutil_getlogin(pamh); + + if (fromsu != NULL) { + tpwd = pam_modutil_getpwnam (pamh, fromsu); + } + + if (fromsu == NULL || tpwd == NULL) { + if (ctrl & PAM_DEBUG_ARG) { + pam_syslog(pamh, LOG_NOTICE, "who is running me ?!"); + } + return PAM_SERVICE_ERR; + } } /* |