From: Mantas Mikulėnas <grawity@gmail.com>
Date: Mon, 20 Feb 2017 21:38:40 +0000 (+0200)
Subject: rpc: Try $XDG_CACHE_HOME before ~/.cache
X-Git-Tag: 0.23.4~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c65752d596e69f48ebe67694cfb2a91697a676bf;p=p11-kit

rpc: Try $XDG_CACHE_HOME before ~/.cache

This is unset on most systems, but might as well follow the Base
Directory spec properly.
---

diff --git a/p11-kit/client.c b/p11-kit/client.c
index 75aebe8..b4eb57f 100644
--- a/p11-kit/client.c
+++ b/p11-kit/client.c
@@ -96,6 +96,17 @@ get_runtime_directory (char **directoryp)
 	}
 
 	/* We can't use /run/user/<UID>, fallback to ~/.cache.  */
+	envvar = secure_getenv ("XDG_CACHE_HOME");
+
+	if (envvar != NULL && envvar[0] != '\0') {
+		directory = strdup (envvar);
+		if (!directory)
+			return CKR_HOST_MEMORY;
+
+		*directoryp = directory;
+		return CKR_OK;
+	}
+
 	if (getpwuid_r (uid, &pwbuf, buf, sizeof buf, &pw) < 0 ||
 	    pw == NULL || pw->pw_dir == NULL || *pw->pw_dir != '/')
 		return CKR_GENERAL_ERROR;