summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <sven.wegener@stealer.net>2020-11-24 23:47:11 +0100
committerSven Wegener <sven.wegener@stealer.net>2020-11-26 05:33:52 +0100
commita8792abc4a978ce0ca5fe7ffebc62303ffb5b920 (patch)
tree891717a6f64c1d9cd2303175f047dd0fdb6d8044
parentf2766ff160549da1114f76982b0afb85bdb55e43 (diff)
downloaddistcc-git-a8792abc4a978ce0ca5fe7ffebc62303ffb5b920.tar.gz
Close directories after checking
-rw-r--r--src/daemon.c6
-rw-r--r--src/serve.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/daemon.c b/src/daemon.c
index c8fee7c..9bcf94a 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -170,6 +170,12 @@ static void dcc_warn_masquerade_whitelist(void) {
rs_log_crit(LIBDIR "/distcc empty. %s", warn);
dcc_exit(EXIT_COMPILER_MISSING);
}
+ if (d) {
+ closedir(d);
+ }
+ if (e) {
+ closedir(e);
+ }
}
/**
diff --git a/src/serve.c b/src/serve.c
index c5ba473..b7fdac6 100644
--- a/src/serve.c
+++ b/src/serve.c
@@ -405,6 +405,7 @@ static int dcc_check_compiler_whitelist(char *_compiler_name)
char *compiler_path = NULL;
if (asprintf(&compiler_path, "/usr/lib/distcc/%s", compiler_name) && compiler_path) {
if (access(compiler_path, X_OK) < 0) {
+ close(dirfd);
rs_log_crit("%s not in %s or %s whitelist.", compiler_name, LIBDIR "/distcc", "/usr/lib/distcc");
return EXIT_BAD_ARGUMENTS; /* ENOENT, EACCESS, etc */
}
@@ -412,6 +413,8 @@ static int dcc_check_compiler_whitelist(char *_compiler_name)
}
}
+ close(dirfd);
+
rs_trace("%s in" LIBDIR "/distcc whitelist", compiler_name);
return 0;
#else