summaryrefslogtreecommitdiff
path: root/src/stls/stls_s6tlsd.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-11-26 10:04:40 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-11-26 10:04:40 +0000
commit08e88c5efc65a6f49da40aa002bc5f4b0ebee49d (patch)
tree21a3feb40eb54e5f5152cc8605f4c5e07e85052b /src/stls/stls_s6tlsd.c
parent9e6464c5f9d82158d81c027207594b5e12a94ca5 (diff)
downloads6-networking-08e88c5efc65a6f49da40aa002bc5f4b0ebee49d.tar.xz
Add -z option to s6-tlsc/s6-tlsd to clean TLS env vars before spawning (default)
Diffstat (limited to 'src/stls/stls_s6tlsd.c')
-rw-r--r--src/stls/stls_s6tlsd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stls/stls_s6tlsd.c b/src/stls/stls_s6tlsd.c
index 61b1343..ff1b308 100644
--- a/src/stls/stls_s6tlsd.c
+++ b/src/stls/stls_s6tlsd.c
@@ -8,6 +8,7 @@
#include <skalibs/tai.h>
#include <skalibs/env.h>
#include <skalibs/djbunix.h>
+#include <s6-networking/s6net-utils.h>
#include <s6-networking/stls.h>
#define diecfg(cfg, s) strerr_diefu3x(96, (s), ": ", tls_config_error(cfg))
@@ -70,7 +71,7 @@ int stls_s6tlsd (char const *const *argv, char const *const *envp, tain_t const
if (tls_configure(ctx, cfg) < 0) diectx(97, ctx, "tls_configure") ;
tls_config_free(cfg) ;
- pid = child_spawn2(argv[0], argv, envp, fds) ;
+ pid = s6net_clean_tls_and_spawn(argv, envp, fds, !!(preoptions & 2)) ;
if (!pid) strerr_diefu2sys(111, "spawn ", argv[0]) ;
if (gid && setgid(gid) < 0) strerr_diefu1sys(111, "setgid") ;
if (uid && setuid(uid) < 0) strerr_diefu1sys(111, "setuid") ;