rpms/pam/F-7 pam-0.99.8.1-succif-in-operator.patch, NONE, 1.1 pam-0.99.8.1-xauth-no-free.patch, NONE, 1.1 pam.spec, 1.148, 1.149

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/pam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6089

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.8.1-succif-in-operator.patch 
	pam-0.99.8.1-xauth-no-free.patch 
Log Message:
* Wed Nov 28 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-5.2
- do not free memory sent to putenv (#402101)
- pam_succeed_if: fix in operator (#295151)


pam-0.99.8.1-succif-in-operator.patch:

--- NEW FILE pam-0.99.8.1-succif-in-operator.patch ---
Written-by: Tomas Mraz <tmraz at redhat.com>
Reviewed-by: Karel Zak <kzak at redhat.com>

diff -up Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c
--- Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator	2006-08-31 12:20:39.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c	2007-09-19 19:36:22.000000000 +0200
@@ -191,13 +191,19 @@ static int
 evaluate_inlist(const char *left, const char *right)
 {
 	char *p;
-	if ((p=strstr(right, left)) == NULL)
-		return PAM_AUTH_ERR;
-	if (p == right || *(p-1) == ':') { /* ':' is a list separator */
-		p += strlen(left);
-		if (*p == '\0' || *p == ':') {
-		    return PAM_SUCCESS;
+	/* Don't care about left containing ':'. */
+	while ((p=strstr(right, left)) != NULL) {
+		if (p == right || *(p-1) == ':') { /* ':' is a list separator */
+			p += strlen(left);
+			if (*p == '\0' || *p == ':') {
+				return PAM_SUCCESS;
+			}
 		}
+		right = strchr(p, ':');
+		if (right == NULL)
+			break;
+		else
+			++right;
 	}
 	return PAM_AUTH_ERR;
 }

pam-0.99.8.1-xauth-no-free.patch:

--- NEW FILE pam-0.99.8.1-xauth-no-free.patch ---
diff -up Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c
--- Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free	2007-09-21 16:02:06.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c	2007-09-21 16:02:47.000000000 +0200
@@ -573,6 +573,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 				   "can't set environment variable '%s'",
 				   xauthority);
 		putenv (xauthority); /* The environment owns this string now. */
+		xauthority = NULL;
 
 		/* set $DISPLAY in pam handle to make su - work */
 		{


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/F-7/pam.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- pam.spec	22 Aug 2007 11:20:03 -0000	1.148
+++ pam.spec	28 Nov 2007 08:58:29 -0000	1.149
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.7.1
-Release: 5.1%{?dist}
+Release: 5.2%{?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 and pam_console modules are GPLv2+,
 # pam_rhosts_auth module is BSD with advertising
@@ -50,6 +50,8 @@
 Patch97: pam-0.99.7.1-namespace-unknown-user.patch
 Patch98: pam-0.99.6.2-selinux-audit-context.patch
 Patch99: pam-0.99.6.2-namespace-docfix.patch
+Patch100: pam-0.99.8.1-succif-in-operator.patch
+Patch101: pam-0.99.8.1-xauth-no-free.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -125,6 +127,8 @@
 %patch97 -p1 -b .unknown-user
 %patch98 -p1 -b .audit-context
 %patch99 -p1 -b .docfix
+%patch100 -p1 -b .in-operator
+%patch101 -p1 -b .no-free
 
 autoreconf
 
@@ -414,6 +418,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Wed Nov 28 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-5.2
+- do not free memory sent to putenv (#402101)
+- pam_succeed_if: fix in operator (#295151)
+
 * Tue Jun  5 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-5.1
 - pam_namespace: better document behavior on failure (#237249)
 - pam_unix: split out passwd change to a new helper binary (#236316)