From 5d38ea056c82221a0ddc206cd57dd7c1852a3159 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 4 Dec 2016 13:44:23 +0000
Subject:  Remove s6-tls* dependency to libs6net. Improve gen-deps to make
 dynlinking easier.

---
 src/libs6net/deps-lib/s6net              |  1 -
 src/libs6net/s6net_clean_tls_and_spawn.c | 21 ---------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 src/libs6net/s6net_clean_tls_and_spawn.c

(limited to 'src/libs6net')

diff --git a/src/libs6net/deps-lib/s6net b/src/libs6net/deps-lib/s6net
index b8be843..27067c4 100644
--- a/src/libs6net/deps-lib/s6net
+++ b/src/libs6net/deps-lib/s6net
@@ -2,5 +2,4 @@ s6net_ident_client.o
 s6net_ident_reply_get.o
 s6net_ident_reply_parse.o
 s6net_ident_error.o
-s6net_clean_tls_and_spawn.o
 -lskarnet
diff --git a/src/libs6net/s6net_clean_tls_and_spawn.c b/src/libs6net/s6net_clean_tls_and_spawn.c
deleted file mode 100644
index 67ba79b..0000000
--- a/src/libs6net/s6net_clean_tls_and_spawn.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ISC license. */
-
-#include <sys/types.h>
-#include <skalibs/env.h>
-#include <skalibs/djbunix.h>
-#include <s6-networking/s6net-utils.h>
-
-pid_t s6net_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.2.3