From e7e5a76eb777b1bf3c743097325989a241867976 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 18 Mar 2008 15:49:52 +0000 Subject: [PATCH] - remove a couple of hunks where on third look we don't need to be using WRITABLEFOPEN instead of fopen, because the mode doesn't include writing --- krb5-1.6.3-selinux-label.patch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/krb5-1.6.3-selinux-label.patch b/krb5-1.6.3-selinux-label.patch index 361be8b..0e7a441 100644 --- a/krb5-1.6.3-selinux-label.patch +++ b/krb5-1.6.3-selinux-label.patch @@ -308,18 +308,6 @@ diff -ur krb5-1.6.3/src/lib/kdb/kdb_default.c krb5-1.6.3/src/lib/kdb/kdb_default #endif { int e = errno; -@@ -217,9 +217,9 @@ - defkeyfile[sizeof(defkeyfile) - 1] = '\0'; - - #ifdef ANSI_STDIO -- if (!(kf = fopen((db_args) ? db_args : defkeyfile, "rb"))) -+ if (!(kf = WRITABLEFOPEN((db_args) ? db_args : defkeyfile, "rb"))) - #else -- if (!(kf = fopen((db_args) ? db_args : defkeyfile, "r"))) -+ if (!(kf = WRITABLEFOPEN((db_args) ? db_args : defkeyfile, "r"))) - #endif - return KRB5_KDB_CANTREAD_STORED; - diff -ur krb5-1.6.3/src/lib/krb4/klog.c krb5-1.6.3/src/lib/krb4/klog.c --- krb5-1.6.3/src/lib/krb4/klog.c 2006-03-11 17:23:28.000000000 -0500 +++ krb5-1.6.3/src/lib/krb4/klog.c 2008-03-06 18:48:01.000000000 -0500 @@ -393,18 +381,6 @@ diff -ur krb5-1.6.3/src/lib/krb5/keytab/kt_file.c krb5-1.6.3/src/lib/krb5/keytab if (!KTFILEP(id)) return errno ? errno : EMFILE; writevno = 1; -diff -ur krb5-1.6.3/src/lib/krb5/keytab/kt_srvtab.c krb5-1.6.3/src/lib/krb5/keytab/kt_srvtab.c ---- krb5-1.6.3/src/lib/krb5/keytab/kt_srvtab.c 2008-03-06 19:04:59.000000000 -0500 -+++ krb5-1.6.3/src/lib/krb5/keytab/kt_srvtab.c 2008-03-06 18:20:11.000000000 -0500 -@@ -408,7 +408,7 @@ - krb5_error_code - krb5_ktsrvint_open(krb5_context context, krb5_keytab id) - { -- KTFILEP(id) = fopen(KTFILENAME(id), READ_MODE); -+ KTFILEP(id) = WRITABLEFOPEN(KTFILENAME(id), READ_MODE); - if (!KTFILEP(id)) - return errno; - return 0; diff -ur krb5-1.6.3/src/plugins/kdb/db2/libdb2/btree/bt_open.c krb5-1.6.3/src/plugins/kdb/db2/libdb2/btree/bt_open.c --- krb5-1.6.3/src/plugins/kdb/db2/libdb2/btree/bt_open.c 2000-07-02 23:43:42.000000000 -0400 +++ krb5-1.6.3/src/plugins/kdb/db2/libdb2/btree/bt_open.c 2008-03-06 18:27:37.000000000 -0500