rpms/krb5/devel krb5-1.6.1-selinux-label.patch, 1.4, 1.5 krb5.spec, 1.145, 1.146

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5413

Modified Files:
	krb5-1.6.1-selinux-label.patch krb5.spec 
Log Message:
- allocate space for the nul-terminator in the local pathname when looking up
  a file context, and properly free a previous context (Jose Plans, #426085)


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krb5-1.6.1-selinux-label.patch	17 Sep 2007 20:46:21 -0000	1.4
+++ krb5-1.6.1-selinux-label.patch	18 Dec 2007 18:34:06 -0000	1.5
@@ -693,16 +693,16 @@
 +				len = 0;
 +				wd = getcwd(NULL, len);
 +				if (wd == NULL) {
-+					if (previous == NULL) {
++					if (previous != NULL) {
 +						freecon(previous);
 +					}
 +					return NULL;
 +				}
-+				len = strlen(wd) + strlen(pathname) + 1;
++				len = strlen(wd) + 1 + strlen(pathname) + 1;
 +				genpath = malloc(len);
 +				if (genpath == NULL) {
 +					free(wd);
-+					if (previous == NULL) {
++					if (previous != NULL) {
 +						freecon(previous);
 +					}
 +					return NULL;
@@ -722,7 +722,7 @@
 +#endif
 +			if (matchpathcon(fullpath, mode, &next) != 0) {
 +				free(genpath);
-+				if (previous) {
++				if (previous != NULL) {
 +					freecon(previous);
 +				}
 +				return NULL;
@@ -736,7 +736,7 @@
 +#endif
 +			if (setfscreatecon(next) != 0) {
 +				freecon(next);
-+				if (previous) {
++				if (previous != NULL) {
 +					freecon(previous);
 +				}
 +				return NULL;


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- krb5.spec	5 Dec 2007 15:21:20 -0000	1.145
+++ krb5.spec	18 Dec 2007 18:34:06 -0000	1.146
@@ -15,7 +15,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -222,6 +222,10 @@
 certificate.
 
 %changelog
+* Tue Dec 18 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-3
+- allocate space for the nul-terminator in the local pathname when looking up
+  a file context, and properly free a previous context (Jose Plans, #426085)
+
 * Wed Dec  5 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-2
 - rebuild