From dddbfab568d42e443f102d35c84432824cc59fee Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 22 Mar 2017 21:37:30 +0000 Subject: Fix case where s6-tls[cd] would sometimes not detect an application and remain there forever with its zombie, both condemned to err in limbo for all eternity, the living and the dead, hand in hand --- src/sbearssl/sbearssl_clean_tls_and_spawn.c | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/sbearssl/sbearssl_clean_tls_and_spawn.c (limited to 'src/sbearssl/sbearssl_clean_tls_and_spawn.c') diff --git a/src/sbearssl/sbearssl_clean_tls_and_spawn.c b/src/sbearssl/sbearssl_clean_tls_and_spawn.c deleted file mode 100644 index 258db90..0000000 --- a/src/sbearssl/sbearssl_clean_tls_and_spawn.c +++ /dev/null @@ -1,21 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include "sbearssl-internal.h" - -pid_t sbearssl_clean_tls_and_spawn (char const *const *argv, char const *const *envp, int *fds, uint32_t options) -{ - if (!(options & 1)) return child_spawn2(argv[0], argv, envp, fds) ; - else - { - char const modifs[] = "CADIR\0CAFILE\0KEYFILE\0CERTFILE\0TLS_UID\0TLS_GID" ; - size_t modiflen = sizeof(modifs) ; - size_t n = env_len(envp) ; - char const *newenv[n + 7] ; - size_t newenvlen = env_merge(newenv, n+7, envp, n, modifs, modiflen) ; - if (!newenvlen) return 0 ; - return child_spawn2(argv[0], argv, newenv, fds) ; - } -} -- cgit v1.3.1