diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-12-04 13:44:23 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-12-04 13:44:23 +0000 |
commit | 5d38ea056c82221a0ddc206cd57dd7c1852a3159 (patch) | |
tree | 9494c8025aa9e0ffc3402eba9fd93b4843fe07a6 /src/stls/stls_s6tlsd.c | |
parent | 05f12f4e141e94b3aee7ec79eb6fb47ffd56a119 (diff) | |
download | s6-networking-5d38ea056c82221a0ddc206cd57dd7c1852a3159.tar.xz |
Remove s6-tls* dependency to libs6net. Improve gen-deps to make dynlinking easier.
Diffstat (limited to 'src/stls/stls_s6tlsd.c')
-rw-r--r-- | src/stls/stls_s6tlsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/stls/stls_s6tlsd.c b/src/stls/stls_s6tlsd.c index 64cf01f..0e82ab0 100644 --- a/src/stls/stls_s6tlsd.c +++ b/src/stls/stls_s6tlsd.c @@ -8,8 +8,8 @@ #include <skalibs/tai.h> #include <skalibs/env.h> #include <skalibs/djbunix.h> -#include <s6-networking/s6net-utils.h> #include <s6-networking/stls.h> +#include "stls-internal.h" #define diecfg(cfg, s) strerr_diefu3x(96, (s), ": ", tls_config_error(cfg)) #define diectx(e, ctx, s) strerr_diefu3x(e, (s), ": ", tls_error(ctx)) @@ -71,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 = s6net_clean_tls_and_spawn(argv, envp, fds, !!(preoptions & 2)) ; + pid = stls_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") ; |