From 629a67bec475bdba602433bdda536e31e2444aca Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Thu, 20 Apr 2017 16:55:25 +0200
Subject: [PATCH] drop superfluous 'Changing password' message from pam_unix
 (#658289)

---
 pam-1.3.0-unix-nomsg.patch | 16 ++++++++++++++++
 pam.spec                   |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pam-1.3.0-unix-nomsg.patch

diff --git a/pam-1.3.0-unix-nomsg.patch b/pam-1.3.0-unix-nomsg.patch
new file mode 100644
index 0000000..33c2267
--- /dev/null
+++ b/pam-1.3.0-unix-nomsg.patch
@@ -0,0 +1,16 @@
+diff -up Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c.nomsg Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c
+--- Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c.nomsg	2016-04-11 13:08:47.000000000 +0200
++++ Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c	2017-04-20 16:51:24.853106709 +0200
+@@ -687,12 +687,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
+ 			return PAM_SUCCESS;
+ 		} else if (off(UNIX__IAMROOT, ctrl) ||
+ 			   (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, user, 0, 1))) {
+-			/* instruct user what is happening */
+-			if (off(UNIX__QUIET, ctrl)) {
+-				retval = pam_info(pamh, _("Changing password for %s."), user);
+-				if (retval != PAM_SUCCESS)
+-					return retval;
+-			}
+ 			retval = pam_get_authtok(pamh, PAM_OLDAUTHTOK, &pass_old, NULL);
+ 
+ 			if (retval != PAM_SUCCESS) {
diff --git a/pam.spec b/pam.spec
index e6f670b..1ee659b 100644
--- a/pam.spec
+++ b/pam.spec
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+
 # - this option is redundant as the BSD license allows that anyway.
 # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
@@ -42,6 +42,7 @@ Patch28: pam-1.1.1-console-errmsg.patch
 Patch29: pam-1.3.0-pwhistory-helper.patch
 Patch31: pam-1.1.8-audit-user-mgmt.patch
 Patch32: pam-1.2.1-console-devname.patch
+Patch33: pam-1.3.0-unix-nomsg.patch
 
 %define _pamlibdir %{_libdir}
 %define _moduledir %{_libdir}/security
@@ -120,6 +121,7 @@ cp %{SOURCE18} .
 %patch29 -p1 -b .pwhhelper
 %patch31 -p1 -b .audit-user-mgmt
 %patch32 -p1 -b .devname
+%patch33 -p1 -b .nomsg
 autoreconf -i
 
 %build
@@ -369,6 +371,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Thu Apr 20 2017 Tomáš Mráz <tmraz@redhat.com> 1.3.0-3
+- drop superfluous 'Changing password' message from pam_unix (#658289)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild