From 0f27b084fe6c0ddeec3293ef86730b6c8d9b5120 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@thkukuk.de>
Date: Wed, 13 Feb 2008 14:39:41 +0000
Subject: Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2008-02-13  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_rhosts/Makefile.am: Remove pam_rhosts_auth.
        * modules/pam_rhosts/pam_rhosts_auth.c: Removed.
        * modules/pam_rhosts/tst-pam_rhosts_auth: Removed.

        * modules/pam_namespace/Makefile.am (noinst_HEADERS): Add
        pam_namespace.h.
---
 modules/pam_unix/unix_update.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'modules/pam_unix')

diff --git a/modules/pam_unix/unix_update.c b/modules/pam_unix/unix_update.c
index 6dc8ace4..595b7f8b 100644
--- a/modules/pam_unix/unix_update.c
+++ b/modules/pam_unix/unix_update.c
@@ -26,13 +26,6 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/time.h>
-#ifdef WITH_SELINUX
-#include <selinux/selinux.h>
-#define SELINUX_ENABLED (selinux_enabled!=-1 ? selinux_enabled : (selinux_enabled=is_selinux_enabled()>0))
-static int selinux_enabled=-1;
-#else
-#define SELINUX_ENABLED 0
-#endif
 
 #include <security/_pam_types.h>
 #include <security/_pam_macros.h>
@@ -71,13 +64,13 @@ set_password(const char *forwho, const char *shadow, const char *remember)
     	return PAM_AUTHTOK_LOCK_BUSY;
 
     pwd = getpwnam(forwho);
-    
+
     if (pwd == NULL) {
         retval = PAM_USER_UNKNOWN;
         goto done;
     }
 
-    /* does pass agree with the official one? 
+    /* does pass agree with the official one?
        we always allow change from null pass */
     retval = helper_verify_password(forwho, pass, 1);
     if (retval != PAM_SUCCESS) {
@@ -146,7 +139,7 @@ int main(int argc, char *argv[])
 	if (geteuid() != 0) {
 	    return PAM_CRED_INSUFFICIENT;
 	}
-	
+
 	option = argv[2];
 
 	if (strcmp(option, "update") == 0) {
-- 
cgit v1.2.3