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