[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/pam/devel pam-0.80-cleanup.patch,NONE,1.1 pam.spec,1.82,1.83



Author: tmraz

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

Modified Files:
	pam.spec 
Added Files:
	pam-0.80-cleanup.patch 
Log Message:
* Tue Jul 26 2005 Tomas Mraz <tmraz redhat com> 0.80-4
- fix 64bit bug in pam_pwdb
- don't crash in pam_unix if pam_get_data fail


pam-0.80-cleanup.patch:
 pam_pwdb/pam_pwdb.c |    9 ++++++---
 pam_unix/support.c  |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE pam-0.80-cleanup.patch ---
--- Linux-PAM-0.80/modules/pam_pwdb/pam_pwdb.c.cleanup	2000-11-20 00:54:04.000000000 +0100
+++ Linux-PAM-0.80/modules/pam_pwdb/pam_pwdb.c	2005-07-26 10:13:42.000000000 +0200
@@ -98,11 +98,14 @@
     pwdb_end();
 
     if ( on(UNIX_LIKE_AUTH, ctrl) ) {
-	int *pretval = &retval;
+	const void *pretval = NULL;
 
 	D(("recovering return code from auth call"));
-	pam_get_data(pamh, "pwdb_setcred_return", (const void **) pretval);
-	D(("recovered data indicates that old retval was %d", retval));
+	if ( pam_get_data(pamh, "pwdb_setcred_return", &pretval) 
+	    == PAM_SUCCESS ) {
+	    retval = (int)(long)pretval;
+	    D(("recovered data indicates that old retval was %d", retval));
+	}
     }
 
     return retval;
--- Linux-PAM-0.80/modules/pam_unix/support.c.cleanup	2005-07-18 17:44:24.000000000 +0200
+++ Linux-PAM-0.80/modules/pam_unix/support.c	2005-07-26 10:18:53.000000000 +0200
@@ -818,7 +818,7 @@
 			if (new != NULL) {
 
 			    const char *login_name;
-			    const void *void_old;
+			    const void *void_old = NULL;
 
 
 			    login_name = _pammodutil_getlogin(pamh);


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pam.spec	22 Jul 2005 14:17:33 -0000	1.82
+++ pam.spec	26 Jul 2005 08:36:20 -0000	1.83
@@ -12,7 +12,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.80
-Release: 3
+Release: 4
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch70: pam-0.80-selinux-nofail.patch
 Patch71: pam-0.80-install-perms.patch
 Patch72: pam-0.80-pie.patch
+Patch73: pam-0.80-cleanup.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8, glib2, initscripts >= 3.94
@@ -94,6 +95,7 @@
 %patch70 -p1 -b .nofail
 %patch71 -p1 -b .install-perms
 %patch72 -p1 -b .pie
+%patch73 -p1 -b .cleanup
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -366,6 +368,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Tue Jul 26 2005 Tomas Mraz <tmraz redhat com> 0.80-4
+- fix 64bit bug in pam_pwdb
+- don't crash in pam_unix if pam_get_data fail
+
 * Fri Jul 22 2005 Tomas Mraz <tmraz redhat com> 0.80-3
 - more pam_selinux permissive fixes (Dan Walsh)
 - make binaries PIE (#158938)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]