From: Thorsten Kukuk Date: Fri, 26 Jun 2009 12:23:28 +0000 (+0000) Subject: Relevant BUGIDs: X-Git-Tag: Linux-PAM-1_1_1~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a10774c48223737de31a941f9de53f250db232fc;p=linux-pam Relevant BUGIDs: Purpose of commit: cleanup Commit summary: --------------- 2009-06-26 Thorsten Kukuk * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux code. --- diff --git a/ChangeLog b/ChangeLog index d99006f1..9c86cdf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-06-26 Thorsten Kukuk + * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux + code. + * modules/pam_lastlog/pam_lastlog.c (last_login_failed): Fix usage of wrong variable [bug#2809661]. diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 30ea6687..29b9c67d 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -1,7 +1,7 @@ /* * Main coding by Elliot Lee , Red Hat Software. * Copyright (C) 1996. - * Copyright (c) Jan Rêkorajski, 1999. + * Copyright (c) Jan Rêkorajski, 1999. * Copyright (c) Red Hat, Inc., 2007, 2008. * * Redistribution and use in source and binary forms, with or without @@ -61,11 +61,6 @@ #include #include #include -#ifdef WITH_SELINUX -static int selinux_enabled=-1; -#include -#define SELINUX_ENABLED (selinux_enabled!=-1 ? selinux_enabled : (selinux_enabled=is_selinux_enabled()>0)) -#endif #include @@ -196,7 +191,7 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const snprintf(buffer, sizeof(buffer), "%d", remember); args[4] = x_strdup(buffer); - + execve(UPDATE_HELPER, args, envp); /* should not get here: exit with error */ @@ -698,7 +693,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags, pass_new = NULL; } retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, pass_new); - + if (retval != PAM_SUCCESS && off(UNIX_NOT_SET_PASS, ctrl)) { pam_set_item(pamh, PAM_AUTHTOK, NULL); }