Fix: resolve full path of LTTNG_UST_CLOCK_PLUGIN

This fix is specific to the stable-2.9 branch (and applies to prior
versions) since this was adressed as part of a refactor of the
session daemon's handling of configuration option (e6142f2e).

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 57a73a84731373a20a94cd2f4b9de20966ac859f..9f0bcdc41e8ad0788f5ac841ddabd12de8363d2f 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5525,6 +5525,44 @@ error:
        return ret;
 }
 
+static int set_clock_plugin_env(void)
+{
+       int ret = 0;
+       const char *original_env_value;
+       char *full_path = NULL;
+       char *new_env_value = NULL;
+
+       original_env_value = getenv("LTTNG_UST_CLOCK_PLUGIN");
+       if (!original_env_value) {
+               goto end;
+       }
+
+       full_path = utils_expand_path(original_env_value);
+       if (!full_path) {
+               ERR("Failed to expand LTTNG_UST_CLOCK_PLUGIN path \"%s\"",
+                               original_env_value);
+               ret = -1;
+               goto end;
+       }
+        ret = asprintf(&new_env_value, "LTTNG_UST_CLOCK_PLUGIN=%s",
+                       full_path);
+       free(full_path);
+       if (ret < 0) {
+               PERROR("asprintf");
+               goto end;
+       }
+
+       DBG("Updating environment: %s", new_env_value);
+       ret = putenv(new_env_value);
+       if (ret) {
+               free(new_env_value);
+               PERROR("putenv of LTTNG_UST_CLOCK_PLUGIN");
+               goto end;
+       }
+end:
+       return ret;
+}
+
 /*
  * main
  */
@@ -5566,6 +5604,12 @@ int main(int argc, char **argv)
                goto exit_options;
        }
 
+       ret = set_clock_plugin_env();
+       if (ret) {
+               retval = -1;
+               goto exit_options;
+       }
+
        /* Daemonize */
        if (opt_daemon || opt_background) {
                int i;