diff options
| author | Shawn Landden <slandden@gmail.com> | 2018-02-26 11:28:23 -0800 |
|---|---|---|
| committer | Shawn Landden <slandden@gmail.com> | 2018-02-26 15:23:07 -0800 |
| commit | a41d1bb8e4df8ceb439dd71c6d9511f851524fc0 (patch) | |
| tree | cb8a9f045c933a06a5e558bd1e65869d9e93c321 | |
| parent | 95098c694bde109541a707ce033467632a5bedcb (diff) | |
| download | distcc-git-a41d1bb8e4df8ceb439dd71c6d9511f851524fc0.tar.gz | |
serve: allow masquerade scripts as documented in distcc(1)
| -rw-r--r-- | src/serve.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/serve.c b/src/serve.c index 159449b..d998003 100644 --- a/src/serve.c +++ b/src/serve.c @@ -371,9 +371,6 @@ static int dcc_check_compiler_masq(char *compiler_name) static int dcc_check_compiler_whitelist(char *compiler_name) { int dirfd = -1; - ssize_t len; - struct stat sb; - char linkbuf[MAXPATHLEN]; if (strchr(compiler_name, '/')) return EXIT_BAD_ARGUMENTS; @@ -385,22 +382,13 @@ static int dcc_check_compiler_whitelist(char *compiler_name) return EXIT_DISTCC_FAILED; } - if (fstatat(dirfd, compiler_name, &sb, AT_SYMLINK_NOFOLLOW) == -1) + if (faccessat(dirfd, compiler_name, X_OK, 0) < 0) { + rs_log_crit("%s not in %s whitelist.", compiler_name, "/usr/lib/distcc"); return EXIT_BAD_ARGUMENTS; /* ENOENT, EACCESS, etc */ - if (!S_ISLNK(sb.st_mode)) { - rs_trace("%s/%s is not a symlink", "/usr/lib/distcc", compiler_name); - return EXIT_BAD_ARGUMENTS; } - if ((len = readlinkat(dirfd, compiler_name, linkbuf, sizeof linkbuf)) <= 0) - return EXIT_BAD_ARGUMENTS; - linkbuf[len] = '\0'; - if (strstr(linkbuf, "distcc")) { - rs_trace("%s in /usr/lib/distcc whitelist", compiler_name); - return 0; - } else { - return EXIT_BAD_ARGUMENTS; - } + rs_trace("%s in /usr/lib/distcc whitelist", compiler_name); + return 0; } static const char *include_options[] = { |