diff options
author | Tomas Mraz <tm@t8m.info> | 2005-07-08 07:42:49 +0000 |
---|---|---|
committer | Tomas Mraz <tm@t8m.info> | 2005-07-08 07:42:49 +0000 |
commit | 34c0d8c2f798d79d0e60c97f3533433efbf77232 (patch) | |
tree | 30d9f54632ace319954e012a91fb66b208f08084 /modules/pam_unix | |
parent | 60d37e71810753dc4b68b9fd63fcd6f82e0dfced (diff) | |
download | pam-34c0d8c2f798d79d0e60c97f3533433efbf77232.tar.gz pam-34c0d8c2f798d79d0e60c97f3533433efbf77232.tar.bz2 pam-34c0d8c2f798d79d0e60c97f3533433efbf77232.zip |
Relevant BUGIDs:
Purpose of commit: cleanup
Commit summary:
---------------
Fix for LSB compliance when SELinux enabled.
Diffstat (limited to 'modules/pam_unix')
-rw-r--r-- | modules/pam_unix/support.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 5368ae20..09e15beb 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -713,15 +713,10 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name retval = PAM_SUCCESS; if (pwd == NULL || salt == NULL || !strcmp(salt, "x") || ((salt[0] == '#') && (salt[1] == '#') && !strcmp(salt + 2, name))) { - if (geteuid() || SELINUX_ENABLED) { + if (pwd != NULL && (geteuid() || SELINUX_ENABLED)) { /* we are not root perhaps this is the reason? Run helper */ D(("running helper binary")); retval = _unix_run_helper_binary(pamh, p, ctrl, name); - if (pwd == NULL && !on(UNIX_AUDIT,ctrl) - && retval != PAM_SUCCESS) - { - name = NULL; - } } else { D(("user's record unavailable")); p = NULL; |