From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 22 Nov 2018 13:07:37 +0000 (+0100)
Subject: file: use global exec timeout instead of own hardcoded limit
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2cc4b998ec78fc8fb9e12a5e67e71c34b2511719;p=oweals%2Frpcd.git

file: use global exec timeout instead of own hardcoded limit

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/file.c b/file.c
index a09e9de..fbc099c 100644
--- a/file.c
+++ b/file.c
@@ -39,7 +39,6 @@
 
 /* limit of regular files and command output data */
 #define RPC_FILE_MAX_SIZE		(4096 * 64)
-#define RPC_FILE_MAX_RUNTIME	(3 * 1000)
 
 #define ustream_for_each_read_buffer(stream, ptr, len) \
 	for (ptr = ustream_get_read_buf(stream, &len);     \
@@ -691,7 +690,7 @@ rpc_file_exec_run(const char *cmd,
 		uloop_process_add(&c->process);
 
 		c->timeout.cb = rpc_file_exec_timeout_cb;
-		uloop_timeout_set(&c->timeout, RPC_FILE_MAX_RUNTIME);
+		uloop_timeout_set(&c->timeout, exec_timeout);
 
 		close(opipe[1]);
 		close(epipe[1]);