summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2016-02-22 22:06:55 +0000
committerRobbie Harwood <rharwood@redhat.com>2016-02-22 22:06:57 +0000
commit8bddc884ac44d6281e9a835e6ade4373bf4b8e28 (patch)
tree648ff5307a5cfe4463f4319518e8c7a7a7423520
parent96d71f74f7f2a375024444f58761a28de99f1202 (diff)
downloadkrb5-8bddc884ac44d6281e9a835e6ade4373bf4b8e28.tar.gz
krb5-8bddc884ac44d6281e9a835e6ade4373bf4b8e28.tar.xz
krb5-8bddc884ac44d6281e9a835e6ade4373bf4b8e28.zip
Fix log file permissions patch with our selinux
Resolves: #1309421
-rw-r--r--krb5-1.14.1-log_file_permissions.patch4
-rw-r--r--krb5.spec6
2 files changed, 7 insertions, 3 deletions
diff --git a/krb5-1.14.1-log_file_permissions.patch b/krb5-1.14.1-log_file_permissions.patch
index 2e8795b..0fb965c 100644
--- a/krb5-1.14.1-log_file_permissions.patch
+++ b/krb5-1.14.1-log_file_permissions.patch
@@ -10,7 +10,7 @@ allows them.
[ghudson@mit.edu: wrote commit message, de-indented post-open setup
code]
-[rharwood@redhat.com: backport not clean for some reason?]
+[rharwood@redhat.com: backport not clean due to SELinux patching]
ticket: 8344 (new)
---
@@ -45,7 +45,7 @@ index 19c4355..f4a9387 100644
- } else {
+ append = (cp[4] == ':') ? O_APPEND : 0;
+ if (append || cp[4] == '=') {
-+ fd = open(&cp[5], O_CREAT | O_WRONLY | append,
++ fd = THREEPARAMOPEN(&cp[5], O_CREAT | O_WRONLY | append,
+ S_IRUSR | S_IWUSR | S_IRGRP);
+ if (fd != -1)
+ f = fdopen(fd, append ? "a" : "w");
diff --git a/krb5.spec b/krb5.spec
index 4b4df2b..893f41c 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -13,7 +13,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.14
-Release: 22%{?dist}
+Release: 23%{?dist}
# - Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
# - The sources below are stored in a lookaside cache. Upload with
@@ -777,6 +777,10 @@ exit 0
%changelog
+* Mon Feb 22 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-23
+- Fix log file permissions patch with our selinux
+- Resolves: #1309421
+
* Fri Feb 19 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-22
- Backport my interposer fixes from upstream
- Supersedes krb5-mechglue_inqure_attrs.patch