rpms/pam/devel pam-0.80-unix-honor-nis.patch, NONE, 1.1 pam.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21953

Modified Files:
	pam.spec 
Added Files:
	pam-0.80-unix-honor-nis.patch 
Log Message:
- pam_unix: always honor nis flag on password change (by Aaron Hope)


pam-0.80-unix-honor-nis.patch:
 pam_unix_passwd.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pam-0.80-unix-honor-nis.patch ---
--- Linux-PAM/modules/pam_unix/pam_unix_passwd.c.cvs	2005-08-25 13:39:24.270406862 -0400
+++ Linux-PAM/modules/pam_unix/pam_unix_passwd.c	2005-08-25 13:58:13.915126603 -0400
@@ -1051,10 +1051,10 @@
 	 * getpwnam() doesn't tell you *where* the information it gives you
 	 * came from, nor should it.  That's our job.
 	 */
-	if (_unix_comesfromsource(pamh, user, 1, 1) == 0) {
+	if (_unix_comesfromsource(pamh, user, 1, on(UNIX_NIS, ctrl)) == 0) {
 		_log_err(LOG_DEBUG, pamh,
-			 "user \"%s\" does not exist in /etc/passwd or NIS",
-			 user);
+			 "user \"%s\" does not exist in /etc/passwd%s",
+			 user, on(UNIX_NIS, ctrl) ? " or NIS" : "");
 		return PAM_USER_UNKNOWN;
 	} else {
 		struct passwd *pwd;


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- pam.spec	20 Sep 2005 12:34:48 -0000	1.87
+++ pam.spec	20 Sep 2005 13:42:45 -0000	1.88
@@ -36,6 +36,7 @@
 Patch73: pam-0.80-cleanup.patch
 Patch74: pam-0.79-userdb-test-null.patch
 Patch75: pam-0.80-limits-process.patch
+Patch76: pam-0.80-unix-honor-nis.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8, glib2, initscripts >= 3.94
@@ -102,6 +103,7 @@
 %patch73 -p1 -b .cleanup
 %patch74 -p1 -b .test-null
 %patch75 -p1 -b .process-limit
+%patch76 -p1 -b .honor-nis
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -376,6 +378,7 @@
 %changelog
 * Tue Sep 20 2005 Tomas Mraz <tmraz at redhat.com> 0.80-8
 - process limit values other than RLIMIT_NICE correctly (#168790)
+- pam_unix: always honor nis flag on password change (by Aaron Hope)
 
 * Wed Aug 24 2005 Tomas Mraz <tmraz at redhat.com> 0.80-7
 - don't fail in audit code when audit is not compiled in