summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:52:04 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:52:04 +0000
commit8e9889a8674748384bf376f4e4149eb8ceb0529c (patch)
tree1fbf2d01b815e5d58e4638956d96a0453f6c44e7
parent5d38ea056c82221a0ddc206cd57dd7c1852a3159 (diff)
downloads6-networking-8e9889a8674748384bf376f4e4149eb8ceb0529c.tar.xz
Fix sbearssl build
-rw-r--r--src/sbearssl/sbearssl_s6tlsc.c1
-rw-r--r--src/sbearssl/sbearssl_s6tlsd.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/sbearssl/sbearssl_s6tlsc.c b/src/sbearssl/sbearssl_s6tlsc.c
index 598774a..3a257a5 100644
--- a/src/sbearssl/sbearssl_s6tlsc.c
+++ b/src/sbearssl/sbearssl_s6tlsc.c
@@ -12,6 +12,7 @@
#include <skalibs/djbunix.h>
#include <skalibs/random.h>
#include <s6-networking/sbearssl.h>
+#include "sbearssl-internal.h"
int sbearssl_s6tlsc (char const *const *argv, char const *const *envp, tain_t const *tto, uint32_t preoptions, uint32_t options, uid_t uid, gid_t gid, unsigned int verbosity, char const *servername, int *sfd)
{
diff --git a/src/sbearssl/sbearssl_s6tlsd.c b/src/sbearssl/sbearssl_s6tlsd.c
index aa32ed1..6cb3f51 100644
--- a/src/sbearssl/sbearssl_s6tlsd.c
+++ b/src/sbearssl/sbearssl_s6tlsd.c
@@ -12,6 +12,7 @@
#include <skalibs/djbunix.h>
#include <skalibs/random.h>
#include <s6-networking/sbearssl.h>
+#include "sbearssl-internal.h"
int sbearssl_s6tlsd (char const *const *argv, char const *const *envp, tain_t const *tto, uint32_t preoptions, uint32_t options, uid_t uid, gid_t gid, unsigned int verbosity)
{
@@ -90,7 +91,7 @@ int sbearssl_s6tlsd (char const *const *argv, char const *const *envp, tain_t co
br_ssl_engine_inject_entropy(&sc.eng, buf, 32) ;
random_finish() ;
- pid = s6net_clean_tls_and_spawn(argv, envp, fds, !!(preoptions & 2)) ;
+ pid = sbearssl_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") ;