1 files changed, 2 insertions, 9 deletions
diff --git a/src/tls/s6tls_ucspi_exec_app.c b/src/tls/s6tls_ucspi_exec_app.c
index 34c05e2..6a319b6 100644
--- a/src/tls/s6tls_ucspi_exec_app.c
+++ b/src/tls/s6tls_ucspi_exec_app.c
@@ -1,26 +1,19 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <skalibs/types.h>
-#include <skalibs/exec.h>
 
 #include "s6tls-internal.h"
 
 void s6tls_ucspi_exec_app (char const *const *argv, int const p[4][2], uint32_t options)
 {
   size_t m = 0 ;
-  char modif[sizeof(s6tls_envvars) + 33 + 3 * UINT_FMT] ;
+  char modif[33 + 3 * UINT_FMT] ;
   close(p[2][1]) ;
   close(p[1][1]) ;
   close(p[0][0]) ;
-  if (options & 1)
-  {
-    memcpy(modif + m, s6tls_envvars, sizeof(s6tls_envvars)) ;
-    m += sizeof(s6tls_envvars) ;
-  }
   memcpy(modif + m, "SSLCTLFD=", 9) ; m += 9 ;
   m += uint_fmt(modif + m, p[2][0]) ;
   modif[m++] = 0 ;
@@ -30,5 +23,5 @@ void s6tls_ucspi_exec_app (char const *const *argv, int const p[4][2], uint32_t
   memcpy(modif + m, "SSLWRITEFD=", 11) ; m += 11 ;
   m += uint_fmt(modif + m, p[0][1]) ;
   modif[m++] = 0 ;
-  xmexec_m(argv, modif, m) ;
+  s6tls_clean_and_exec(argv, options, modif, m) ;
 }