s4:lib: Remove gnutls_global_(de)init() from libtls

This is handled by the gnutls library constructor/destructor.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index b68996db894bde2baa78229f721b8d12bab13518..55bca0367762e66863cec472eef97443a8adcf8b 100644 (file)
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -903,12 +903,6 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
        struct tstream_tls_params *tlsp;
        int ret;
 
-       ret = gnutls_global_init();
-       if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-               return NT_STATUS_NOT_SUPPORTED;
-       }
-
        tlsp = talloc_zero(mem_ctx, struct tstream_tls_params);
        NT_STATUS_HAVE_NO_MEMORY(tlsp);
 
@@ -1123,12 +1117,6 @@ NTSTATUS tstream_tls_params_server(TALLOC_CTX *mem_ctx,
                return NT_STATUS_OK;
        }
 
-       ret = gnutls_global_init();
-       if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-               return NT_STATUS_NOT_SUPPORTED;
-       }
-
        tlsp = talloc_zero(mem_ctx, struct tstream_tls_params);
        NT_STATUS_HAVE_NO_MEMORY(tlsp);
 

diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index e02ee13d7e9a5b761e1332fef05e083031cb23e6..f5e9a1f2d39ce1ebee3f6f363460fc8c780d090d 100644 (file)
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -62,8 +62,6 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
        } \
 } while (0)
 
-       TLSCHECK(gnutls_global_init());
-
        DEBUG(0,("Attempting to autogenerate TLS self-signed keys for https for hostname '%s'\n", 
                 hostname));
 
@@ -150,7 +148,6 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
        gnutls_x509_privkey_deinit(cakey);
        gnutls_x509_crt_deinit(cacrt);
        gnutls_x509_crt_deinit(crt);
-       gnutls_global_deinit();
 
        DEBUG(0,("TLS self-signed keys generated OK\n"));
        return;