1 files changed, 5 insertions, 23 deletions
diff --git a/debian/patches-applied/054_pam_security_abstract_securetty_handling b/debian/patches-applied/054_pam_security_abstract_securetty_handling
index d5048cb2..8c3ce2c0 100644
--- a/debian/patches-applied/054_pam_security_abstract_securetty_handling
+++ b/debian/patches-applied/054_pam_security_abstract_securetty_handling
@@ -33,7 +33,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.c
  
      /* log a trail for debugging */
      if (ctrl & PAM_DEBUG_ARG) {
-@@ -101,63 +97,13 @@
+@@ -99,51 +95,7 @@
  	return PAM_SERVICE_ERR;
      }
  
@@ -82,28 +82,10 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.c
 -    }
 -    fclose(ttyfile);
 -
--    if (retval) {
--	    pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !",
--		     uttyname);
--
--	    retval = PAM_AUTH_ERR;
--    } else {
--	if (ctrl & PAM_DEBUG_ARG) {
--	    pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'",
--		     username, uttyname);
--	}
--	retval = PAM_SUCCESS;
--
 +    retval = _pammodutil_tty_secure(pamh, uttyname);
-+    if ((retval == PAM_SUCCESS) && (ctrl & PAM_DEBUG_ARG)) {
-+	pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'",
-+	           username, uttyname);
-+    } else if (retval != PAM_SUCCESS) {
-+	pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !",
-+	           uttyname);
-     }
- 
-     return retval;
+     if (retval) {
+ 	    pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !",
+ 		     uttyname);
 Index: pam.deb/modules/pam_securetty/tty_secure.c
 ===================================================================
 --- /dev/null
@@ -203,7 +185,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.am
 ===================================================================
 --- pam.deb.orig/modules/pam_securetty/Makefile.am
 +++ pam.deb/modules/pam_securetty/Makefile.am
-@@ -23,6 +23,10 @@
+@@ -24,6 +24,10 @@
  securelib_LTLIBRARIES = pam_securetty.la
  pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam