rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

cut out an extraneous label configuration reload

Browse Source 
- cut down the number of times we load SELinux labeling configuration from
  a minimum of two times to actually one (more of #845125)
This commit is contained in:
Nalin Dahyabhai 2012-09-06 18:42:40 -04:00
parent 7f06579f48
commit cf693a2998
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
krb5-1.10.2-selinux-label.patch
View File

@ -465,7 +465,7 @@ which we used earlier, is some improvement.
--- krb5/src/util/support/selinux.c --- krb5/src/util/support/selinux.c
+++ krb5/src/util/support/selinux.c +++ krb5/src/util/support/selinux.c
@@ -0,0 +1,402 @@ @@ -0,0 +1,405 @@
+/* +/*
+ * Copyright 2007,2008,2009,2011,2012 Red Hat, Inc. All Rights Reserved. + * Copyright 2007,2008,2009,2011,2012 Red Hat, Inc. All Rights Reserved.
+ * + *
@ -597,7 +597,8 @@ which we used earlier, is some improvement.
+#endif +#endif
+ configuredsc = NULL; + configuredsc = NULL;
+#ifdef HAVE_SELINUX_LABEL_H +#ifdef HAVE_SELINUX_LABEL_H
+ if (selabel_ctx != NULL) { + if ((selabel_ctx != NULL) ||
+ (selabel_last_changed == 0)) {
+ const char *cpath; + const char *cpath;
+ struct stat st; + struct stat st;
+ int i = -1; + int i = -1;
@ -605,8 +606,10 @@ which we used earlier, is some improvement.
+ if ((cpath == NULL) || + if ((cpath == NULL) ||
+ ((i = stat(cpath, &st)) != 0) || + ((i = stat(cpath, &st)) != 0) ||
+ (st.st_mtime != selabel_last_changed)) { + (st.st_mtime != selabel_last_changed)) {
+ if (selabel_ctx != NULL) {
+ selabel_close(selabel_ctx); + selabel_close(selabel_ctx);
+ selabel_ctx = NULL; + selabel_ctx = NULL;
+ }
+ selabel_last_changed = i ? + selabel_last_changed = i ?
+ time(NULL) : + time(NULL) :
+ st.st_mtime; + st.st_mtime;

6
krb5.spec
View File

@ -29,7 +29,7 @@
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.10.3 Version: 1.10.3
Release: 3%{?dist} Release: 4%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead? # Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.3-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.3-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -839,6 +839,10 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Thu Sep 6 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-4
- cut down the number of times we load SELinux labeling configuration from
a minimum of two times to actually one (more of #845125)
* Thu Aug 30 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-3 * Thu Aug 30 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-3
- backport patch to disable replay detection in krb5_verify_init_creds() - backport patch to disable replay detection in krb5_verify_init_creds()
while reading the AP-REQ that's generated in the same function (RT#7229) while reading the AP-REQ that's generated in the same function (RT#7229)