summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-11-27 17:57:36 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-11-28 16:36:20 +0100
commited93cf0e084d52ca58c8a966fa9506af4484a8a9 (patch)
tree430230cb1b825e00b6cb75c8472f683b47eadf76
parent49084ebc641f426287567a722697735e3de028dc (diff)
downloadtdebase-ed93cf0e084d52ca58c8a966fa9506af4484a8a9.tar.gz
tdebase-ed93cf0e084d52ca58c8a966fa9506af4484a8a9.zip
ksmserver: Use the IceAuthFileName() function
instead of building the file name. This relates to bug 3027. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ksmserver/main.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 1004c439..977ba02e 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -99,14 +99,10 @@ void sanity_check( int argc, char* argv[] )
}
if (msg.isEmpty())
{
- path = getenv("ICEAUTHORITY");
+ path = IceAuthFileName();
if (path.isEmpty())
- {
- path = getenv("HOME");
- path += "/.ICEauthority";
- }
-
- if (access(path.data(), W_OK) && (errno != ENOENT))
+ msg = "Unable to determine path for ICEauthority file.";
+ else if (access(path.data(), W_OK) && (errno != ENOENT))
msg = "No write access to '%s'.";
else if (access(path.data(), R_OK) && (errno != ENOENT))
msg = "No read access to '%s'.";