]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #17079 from keszybz/late-exec-resolution
authorLennart Poettering <lennart@poettering.net>
Thu, 3 Dec 2020 13:58:20 +0000 (14:58 +0100)
committerGitHub <noreply@github.com>
Thu, 3 Dec 2020 13:58:20 +0000 (14:58 +0100)
Resolve executable paths before execution, use fexecve()

1  2 
meson.build
meson_options.txt
src/basic/missing_syscall.h
src/basic/path-util.c
src/basic/path-util.h
src/core/execute.c
src/shared/exec-util.c
src/shared/exec-util.h
src/test/test-path-util.c
test/meson.build

diff --cc meson.build
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index f4f8d0550b779f11f11c462581ba9b684981d885,c05a5d5b4a9cd755e099ddeb13cfc86c8373801b..874bab8f9405c6c21c882c91528711cfbd9f040f
@@@ -184,9 -186,9 +186,9 @@@ static void test_find_executable_full(v
          if (p)
                  assert_se(oldpath = strdup(p));
  
 -        assert_se(unsetenv("PATH") >= 0);
 +        assert_se(unsetenv("PATH") == 0);
  
-         assert_se(find_executable_full("sh", true, &p) == 0);
+         assert_se(find_executable_full("sh", true, &p, NULL) == 0);
          puts(p);
          assert_se(streq(basename(p), "sh"));
          free(p);
Simple merge