summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2010-03-02 23:01:24 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2010-03-02 23:01:24 +0000
commit74067752dde25f72c3a5418561836991a3223a7e (patch)
treeefa0302cc5799ea1e4e1c4a1ed337eb89aa9f8ff
parent09524417cd7cd95176ee86db99f00fdebf8105ac (diff)
downloadkrb5-74067752dde25f72c3a5418561836991a3223a7e.tar.gz
krb5-74067752dde25f72c3a5418561836991a3223a7e.tar.xz
krb5-74067752dde25f72c3a5418561836991a3223a7e.zip
- fix a regression (not labeling a kdb database lock file correctly,
#569902)
-rw-r--r--krb5-1.6.3-selinux-label.patch18
-rw-r--r--krb5.spec5
2 files changed, 22 insertions, 1 deletions
diff --git a/krb5-1.6.3-selinux-label.patch b/krb5-1.6.3-selinux-label.patch
index f15cc7a..d364077 100644
--- a/krb5-1.6.3-selinux-label.patch
+++ b/krb5-1.6.3-selinux-label.patch
@@ -441,6 +441,24 @@ diff -ur krb5-1.6.3/src/plugins/kdb/db2/libdb2/recno/rec_open.c krb5-1.6.3/src/p
retval = errno;
goto err_out;
}
+@@ -754,7 +754,7 @@
+ if (!okname)
+ retval = ENOMEM;
+ else {
+- fd = open(okname, O_CREAT | O_RDWR | O_TRUNC, 0600);
++ fd = THREEPARAMOPEN(okname, O_CREAT | O_RDWR | O_TRUNC, 0600);
+ if (fd < 0)
+ retval = errno;
+ else
+@@ -1795,7 +1795,7 @@
+ retval = ENOMEM;
+ goto errout;
+ }
+- db_ctx->db_lf_file = open(db_ctx->db_lf_name, O_RDWR|O_CREAT, 0600);
++ db_ctx->db_lf_file = THREEPARAMOPEN(db_ctx->db_lf_name, O_RDWR|O_CREAT, 0600);
+ if (db_ctx->db_lf_file < 0) {
+ retval = errno;
+ goto errout;
diff -ur krb5-1.6.3/src/util/profile/prof_file.c krb5-1.6.3/src/util/profile/prof_file.c
--- krb5-1.6.3/src/util/profile/prof_file.c 2005-10-21 16:03:44.000000000 -0400
+++ krb5-1.6.3/src/util/profile/prof_file.c 2008-03-06 19:02:44.000000000 -0500
diff --git a/krb5.spec b/krb5.spec
index 1744336..f82bf57 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -16,7 +16,7 @@
Summary: The Kerberos network authentication system.
Name: krb5
Version: 1.6.3
-Release: 25%{?dist}
+Release: 26%{?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
@@ -241,6 +241,9 @@ to obtain initial credentials from a KDC using a private key and a
certificate.
%changelog
+* Tue Mar 2 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.6.3-26
+- fix a regression (not labeling a kdb database lock file correctly, #569902)
+
* Fri Jan 22 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.6.3-25
- use portreserve correctly -- portrelease takes the basename of the file
whose entries should be released, so we need three files, not one