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.

diff --git a/ChangeLog b/ChangeLog
index d99006f18eb272660608a6cf54b396ad570a4bdd..9c86cdf256fca7313a1f33a9ae6c9840837f4dff 100644 (file)
--- 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 30ea6687c2fd9fc83dee95d884e4fc533bd9702a..29b9c67d6484d4111c63dc5be52b151fd9e0d463 100644 (file)
--- 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);
                        }