From c7be23675a7e4a025b9e5a5375aaed6139e653db Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 19 Mar 2018 16:34:47 +0000
Subject: Automatically handle library initialisation for libtls.

Now that we have tls_init() under pthread_once(), automatically initialise
libtls from the entry point functions (tls_config(), tls_client() and
tls_server()) - this makes an explicit tls_init() call no longer a
requirement.

ok bcook@ beck@ inoguchi@
---
 src/lib/libtls/tls_server.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/libtls/tls_server.c')

diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index 98b0957437..44bef6bb11 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.43 2018/02/08 05:56:49 jsing Exp $ */
+/* $OpenBSD: tls_server.c,v 1.44 2018/03/19 16:34:47 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -31,6 +31,9 @@ tls_server(void)
 {
 	struct tls *ctx;
 
+	if (tls_init() == -1)
+		return (NULL);
+
 	if ((ctx = tls_new()) == NULL)
 		return (NULL);
 
-- 
cgit v1.2.3-55-g6feb