nspawn: Fix incorrect usage of putenv
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 1 Aug 2020 14:05:01 +0000 (15:05 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 20 Sep 2020 10:33:45 +0000 (12:33 +0200)
strv_env_get only returns the environment variable value. putenv expects
KEY=VALUE format strings. Use setenv instead to fix the use.

(cherry picked from commit 6f646e01755df587bb33dae4ca78cdaad5721f5e)
(cherry picked from commit b81504a3c76bfb3afd339cb74988892f9dccedd1)
(cherry picked from commit 492a8b34178cf851ded4f23815d1182025bbbf8a)

src/nspawn/nspawn.c

index 873a76596f0b485906b51e31372cdddf18cafbcb..d9a8c5071888529512a811dbddac679168f2737a 100644 (file)
@@ -3188,7 +3188,7 @@ static int inner_child(
                  * binary. */
                 dollar_path = strv_env_get(env_use, "PATH");
                 if (dollar_path) {
-                        if (putenv((char*) dollar_path) != 0)
+                        if (setenv("PATH", dollar_path, 1) < 0)
                                 return log_error_errno(errno, "Failed to update $PATH: %m");
                 }