summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2009-06-26 12:23:28 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2009-06-26 12:23:28 +0000
commita10774c48223737de31a941f9de53f250db232fc (patch)
tree87342c765ba9a53bc24b3820a121f4e7927af115
parent9c7be916c205257cbc40f4ab179ebe490ebe40f6 (diff)
Relevant BUGIDs:
Purpose of commit: cleanup Commit summary: --------------- 2009-06-26 Thorsten Kukuk <kukuk@thkukuk.de> * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux code.
-rw-r--r--ChangeLog3
-rw-r--r--modules/pam_unix/pam_unix_passwd.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d99006f1..9c86cdf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2009-06-26 Thorsten Kukuk <kukuk@thkukuk.de>
+ * 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 <sopwith@redhat.com>, 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 <signal.h>
#include <errno.h>
#include <sys/wait.h>
-#ifdef WITH_SELINUX
-static int selinux_enabled=-1;
-#include <selinux/selinux.h>
-#define SELINUX_ENABLED (selinux_enabled!=-1 ? selinux_enabled : (selinux_enabled=is_selinux_enabled()>0))
-#endif
#include <security/_pam_macros.h>
@@ -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);
}