summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2010-03-02 23:01:25 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2010-03-02 23:01:25 +0000
commitab8504508b599daa16658d9bb48a90b22155b875 (patch)
tree27091f238005cefe6c8c94eb0c054935d5753255
parent8193f773d0d7a64fa6bcf3449c29a41e17646288 (diff)
downloadkrb5-ab8504508b599daa16658d9bb48a90b22155b875.tar.gz
krb5-ab8504508b599daa16658d9bb48a90b22155b875.tar.xz
krb5-ab8504508b599daa16658d9bb48a90b22155b875.zip
- fix a regression (not labeling a kdb database lock file correctly,krb5-1_7_1-4_fc13
#569902)
-rw-r--r--krb5-1.7-selinux-label.patch18
-rw-r--r--krb5.spec5
2 files changed, 22 insertions, 1 deletions
diff --git a/krb5-1.7-selinux-label.patch b/krb5-1.7-selinux-label.patch
index 106af6d..0e967a6 100644
--- a/krb5-1.7-selinux-label.patch
+++ b/krb5-1.7-selinux-label.patch
@@ -356,6 +356,24 @@ diff -up krb5-1.7/src/plugins/kdb/db2/kdb_db2.c krb5-1.7/src/plugins/kdb/db2/kdb
retval = errno;
goto err_out;
}
+@@ -754,7 +754,7 @@ krb5_db2_db_create(krb5_context context,
+ 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 @@ krb5_db2_db_rename(context, from, to)
+ 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 -up krb5-1.7/src/plugins/kdb/db2/libdb2/btree/bt_open.c krb5-1.7/src/plugins/kdb/db2/libdb2/btree/bt_open.c
--- krb5-1.7/src/plugins/kdb/db2/libdb2/btree/bt_open.c 2007-10-22 15:18:53.000000000 -0400
+++ krb5-1.7/src/plugins/kdb/db2/libdb2/btree/bt_open.c 2009-06-04 13:47:20.000000000 -0400
diff --git a/krb5.spec b/krb5.spec
index 00454c5..63641d9 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
Source0: krb5-%{version}.tar.gz
@@ -224,6 +224,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.7.1-4
+- fix a regression (not labeling a kdb database lock file correctly, #569902)
+
* Wed Feb 17 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-3
- pull up the change to make kpasswd's behavior better match the docs
when there's no ccache (#563431)