summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2016-12-21 02:59:12 +0300
committerSlávek Banko <slavek.banko@axis.cz>2017-01-03 00:46:22 +0100
commitf56dd14a9800ee2dc5b1357dfa15585555236f31 (patch)
treeddacf23996c582961427aa1eae4079e77cebeed3
parentb8802de2c09b31fce7717a500cd5ffe8bada1b27 (diff)
downloadtdelibs-f56dd14a9800ee2dc5b1357dfa15585555236f31.tar.gz
tdelibs-f56dd14a9800ee2dc5b1357dfa15585555236f31.zip
tdeinit: make lnusertemp respect HOME for root
This resolves bug 2739 Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit d23ac70c47e70cb082d38e13c4cd741769d1bb2b)
-rw-r--r--tdeinit/lnusertemp.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/tdeinit/lnusertemp.c b/tdeinit/lnusertemp.c
index 5d739f680..4358c40f6 100644
--- a/tdeinit/lnusertemp.c
+++ b/tdeinit/lnusertemp.c
@@ -124,14 +124,15 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
if (kde_home[0] == '~')
{
- if (uid == 0)
- {
- home_dir = pw_ent->pw_dir ? pw_ent->pw_dir : "/root";
- }
if (!home_dir || !home_dir[0])
{
- fprintf(stderr, "[lnusertemp] Aborting. $HOME not set!\n");
- return 1;
+ if ( uid == 0 ) {
+ home_dir = pw_ent->pw_dir ? pw_ent->pw_dir : "/root";
+ }
+ else {
+ fprintf(stderr, "[lnusertemp] Aborting. $HOME not set!\n");
+ return 1;
+ }
}
if (strlen(home_dir) > (PATH_MAX-100))
{