X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=cf610fb3bbb29c206b95616b78db2341fcf61599;hb=refs%2Fheads%2Fstable-2.3;hp=11b165bc15444fa66005f2ee65c4579e6c9fef32;hpb=a5a2d0c25460639304b9bd3991d874774553a39c;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 11b165bc1..cf610fb3b 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -633,11 +633,28 @@ LTTNG_HIDDEN
 char *utils_get_home_dir(void)
 {
 	char *val = NULL;
+	struct passwd *pwd;
+
 	val = getenv(DEFAULT_LTTNG_HOME_ENV_VAR);
 	if (val != NULL) {
-		return val;
+		goto end;
+	}
+	val = getenv(DEFAULT_LTTNG_FALLBACK_HOME_ENV_VAR);
+	if (val != NULL) {
+		goto end;
 	}
-	return getenv(DEFAULT_LTTNG_FALLBACK_HOME_ENV_VAR);
+
+	/* Fallback on the password file entry. */
+	pwd = getpwuid(getuid());
+	if (!pwd) {
+		goto end;
+	}
+	val = pwd->pw_dir;
+
+	DBG3("Home directory is '%s'", val);
+
+end:
+	return val;
 }
 
 /*