summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2011-02-07 11:24:03 -0500
committerNalin Dahyabhai <nalin@redhat.com>2011-02-07 11:24:03 -0500
commit9fed313d7917523f62ad4b11908ca09c49ef068a (patch)
tree1ac5b6bc3653be5f92b6cf2888cbb7f9744acaad
parent293e1a6e51dc73ac0b18e918d882f1f7b62591e3 (diff)
downloadkrb5-9fed313d7917523f62ad4b11908ca09c49ef068a.tar.gz
krb5-9fed313d7917523f62ad4b11908ca09c49ef068a.tar.xz
krb5-9fed313d7917523f62ad4b11908ca09c49ef068a.zip
fix a compile error in the SELinux labeling patch when -DDEBUG is used (Sumit Bose)
-rw-r--r--krb5-1.9-selinux-label.patch (renamed from krb5-1.8-selinux-label.patch)2
-rw-r--r--krb5.spec8
2 files changed, 7 insertions, 3 deletions
diff --git a/krb5-1.8-selinux-label.patch b/krb5-1.9-selinux-label.patch
index f06f837..5dd274f 100644
--- a/krb5-1.8-selinux-label.patch
+++ b/krb5-1.9-selinux-label.patch
@@ -676,7 +676,7 @@ diff -up krb5-1.8/src/util/support/selinux.c.selinux-label krb5-1.8/src/util/sup
+#ifdef DEBUG
+ if (isatty(fileno(stderr))) {
+ fprintf(stderr, "Setting file creation context "
-+ "to \"%s\".\n", configured);
++ "to \"%s\".\n", configuredsc);
+ }
+#endif
+ if (setfscreatecon(configuredsc) != 0) {
diff --git a/krb5.spec b/krb5.spec
index e7bed1e..7d1e15a 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -44,7 +44,7 @@ Patch56: krb5-1.7-doublelog.patch
Patch59: krb5-1.8-kpasswd_tcp.patch
Patch60: krb5-1.8-pam.patch
Patch61: krb5-1.9-manpaths.patch
-Patch63: krb5-1.8-selinux-label.patch
+Patch63: krb5-1.9-selinux-label.patch
Patch70: krb5-trunk-kpasswd_tcp2.patch
Patch71: krb5-1.9-dirsrv-accountlock.patch
Patch72: krb5-pkinit-cms2.patch
@@ -633,9 +633,13 @@ exit 0
%{_sbindir}/uuserver
%changelog
+* Mon Feb 7 2011 Nalin Dahyabhai <nalin@redhat.com>
+- fix a compile error in the SELinux labeling patch when -DDEBUG is used (Sumit
+ Bose)
+
* Tue Feb 1 2011 Nalin Dahyabhai <nalin@redhat.com>
- properly advertise that the kpropd init script now supports force-reload
- (Zbysek Mraz #630587)
+ (Zbysek Mraz, #630587)
* Wed Jan 26 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-2
- pkinit: when verifying signed data, use the CMS APIs for better