[krb5] - correct a bug in the fix for #754001 so that the file creation context is consistently reset

[Nalin Dahyabhai]

commit 635a422817d3906709964c724865adfd8701f5bd
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Wed Nov 30 15:03:45 2011 -0500

    - correct a bug in the fix for #754001 so that the file creation context is consistently reset

 krb5-1.10-selinux-label.patch |    6 ++----
 krb5.spec                     |    6 +++++-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/krb5-1.10-selinux-label.patch b/krb5-1.10-selinux-label.patch
index 8f46166..6355a05 100644
--- a/krb5-1.10-selinux-label.patch
+++ b/krb5-1.10-selinux-label.patch
@@ -465,7 +465,7 @@ which we used earlier, is some improvement.
  
 --- krb5/src/util/support/selinux.c
 +++ krb5/src/util/support/selinux.c
-@@ -0,0 +1,374 @@
+@@ -0,0 +1,372 @@
 +/*
 + * Copyright 2007,2008,2009,2011 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -706,9 +706,7 @@ which we used earlier, is some improvement.
 +krb5int_pop_fscreatecon(void *con)
 +{
 +	if (con != NULL) {
-+		if (con != (void *) -1) {
-+			pop_fscreatecon(con);
-+		}
++		pop_fscreatecon((con == (void *) -1) ? NULL : con);
 +		k5_mutex_unlock(&labeled_mutex);
 +	}
 +}
diff --git a/krb5.spec b/krb5.spec
index 24ed5a7..e1f00b8 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -15,7 +15,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.10
-Release: 0%{?dist}.alpha1.0
+Release: 0%{?dist}.alpha1.0.1
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-alpha1-signed.tar
 Source0: krb5-%{version}-alpha1.tar.gz
@@ -737,6 +737,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Wed Nov 30 2011 Nalin Dahyabhai <nalin at redhat.com> 1.10-0.alpha1.1
+- correct a bug in the fix for #754001 so that the file creation context is
+  consistently reset
+
 * Tue Nov 15 2011 Nalin Dahyabhai <nalin at redhat.com> 1.10-0.alpha1.0
 - update to 1.10 alpha 1
 - on newer releases where we can assume NSS >= 3.13, configure PKINIT to build