From 2269af1457817b7a3b9b51cc0512d5f29e1fc7a5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 21 Nov 2020 10:56:01 +0000
Subject:  Prepare for 2.4.0.0

---
 src/conn-tools/s6-tcpserver-access.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c
index b09a2b8..ec2ac63 100644
--- a/src/conn-tools/s6-tcpserver-access.c
+++ b/src/conn-tools/s6-tcpserver-access.c
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
+
 #include <skalibs/gccattributes.h>
 #include <skalibs/types.h>
 #include <skalibs/strerr2.h>
@@ -18,11 +19,17 @@
 #include <skalibs/socket.h>
 #include <skalibs/ip46.h>
 #include <skalibs/unix-timed.h>
-#include <execline/config.h>
+
 #include <s6/accessrules.h>
 #include <s6-dns/s6dns.h>
+
+#include <s6-networking/config.h>
 #include <s6-networking/ident.h>
 
+#ifdef S6_NETWORKING_USE_EXECLINE
+#include <execline/config.h>
+#endif
+
 #define USAGE "s6-tcpserver-access [ -v verbosity ] [ -W | -w ] [ -D | -d ] [ -H | -h ] [ -R | -r ] [ -P | -p ] [ -l localname ] [ -B banner ] [ -t timeout ] [ -i rulesdir | -x rulesfile ] prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
 #define dienomem() strerr_diefu1sys(111, "update environment")
@@ -378,10 +385,14 @@ int main (int argc, char const *const *argv, char const *const *envp)
   stralloc_free(&modifs) ;
   if (verbosity) log_accept(getpid(), &remoteip) ;
   if (params.exec.len)
+#ifdef S6_NETWORKING_USE_EXECLINE
   {
     char *specialargv[4] = { EXECLINE_EXTBINPREFIX "execlineb", "-c", params.exec.s, 0 } ;
     xpathexec_r((char const *const *)specialargv, envp, env_len(envp), params.env.s, params.env.len) ;
   }
+#else
+  strerr_warnw1x("exec file found but ignored because s6-networking was compiled without execline support!") ;
+#endif
 
   xpathexec_r(argv, envp, env_len(envp), params.env.s, params.env.len) ;
 
-- 
cgit v1.2.3