2017-12-06 17:48:55 +00:00
|
|
|
From d29ad5a58999cb952cdb8ae876fe8b195a11a3e1 Mon Sep 17 00:00:00 2001
|
2016-09-19 23:49:29 +00:00
|
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
|
Date: Tue, 23 Aug 2016 16:49:57 -0400
|
2016-09-22 19:36:45 +00:00
|
|
|
Subject: [PATCH] krb5-1.11-run_user_0.patch
|
2016-09-19 23:49:29 +00:00
|
|
|
|
2015-10-01 18:33:34 +00:00
|
|
|
A hack: if we're looking at creating a ccache directory directly below
|
|
|
|
the /run/user/0 directory, and /run/user/0 doesn't exist, try to create
|
|
|
|
it, too.
|
2016-09-19 23:49:29 +00:00
|
|
|
---
|
|
|
|
src/lib/krb5/ccache/cc_dir.c | 14 ++++++++++++++
|
|
|
|
1 file changed, 14 insertions(+)
|
2015-10-01 18:33:34 +00:00
|
|
|
|
2016-09-19 23:49:29 +00:00
|
|
|
diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c
|
2017-01-20 22:37:32 +00:00
|
|
|
index 73f0fe62d..4850c0d07 100644
|
2016-09-19 23:49:29 +00:00
|
|
|
--- a/src/lib/krb5/ccache/cc_dir.c
|
|
|
|
+++ b/src/lib/krb5/ccache/cc_dir.c
|
2015-10-01 18:33:34 +00:00
|
|
|
@@ -61,6 +61,8 @@
|
|
|
|
|
|
|
|
#include <dirent.h>
|
|
|
|
|
|
|
|
+#define ROOT_SPECIAL_DCC_PARENT "/run/user/0"
|
|
|
|
+
|
|
|
|
extern const krb5_cc_ops krb5_dcc_ops;
|
|
|
|
extern const krb5_cc_ops krb5_fcc_ops;
|
|
|
|
|
2016-09-19 23:49:29 +00:00
|
|
|
@@ -237,6 +239,18 @@ verify_dir(krb5_context context, const char *dirname)
|
2015-10-01 18:33:34 +00:00
|
|
|
|
|
|
|
if (stat(dirname, &st) < 0) {
|
|
|
|
if (errno == ENOENT) {
|
|
|
|
+ if (strncmp(dirname, ROOT_SPECIAL_DCC_PARENT "/",
|
|
|
|
+ sizeof(ROOT_SPECIAL_DCC_PARENT)) == 0 &&
|
|
|
|
+ stat(ROOT_SPECIAL_DCC_PARENT, &st) < 0 &&
|
|
|
|
+ errno == ENOENT) {
|
|
|
|
+#ifdef USE_SELINUX
|
|
|
|
+ selabel = krb5int_push_fscreatecon_for(ROOT_SPECIAL_DCC_PARENT);
|
|
|
|
+#endif
|
|
|
|
+ status = mkdir(ROOT_SPECIAL_DCC_PARENT, S_IRWXU);
|
|
|
|
+#ifdef USE_SELINUX
|
|
|
|
+ krb5int_pop_fscreatecon(selabel);
|
|
|
|
+#endif
|
|
|
|
+ }
|
|
|
|
#ifdef USE_SELINUX
|
|
|
|
selabel = krb5int_push_fscreatecon_for(dirname);
|
|
|
|
#endif
|