From 34c0d8c2f798d79d0e60c97f3533433efbf77232 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 8 Jul 2005 07:42:49 +0000 Subject: Relevant BUGIDs: Purpose of commit: cleanup Commit summary: --------------- Fix for LSB compliance when SELinux enabled. --- modules/pam_unix/support.c | 7 +------ 1 file changed, 1 insertion(+), 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; -- cgit v1.2.3