doc: clarifications on custom thread override [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index fb4a5aa2f5f14be551c9c3b103f7be45747b39c2..fc5e7acbab1de5537c6837c7cb7d8b8f351ff286 100644 (file)
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -352,15 +352,16 @@ library.
 The GnuTLS library is initialized on load; prior to 3.3.0 was initialized by calling @funcref{gnutls_global_init}@footnote{
 The original behavior of requiring explicit initialization can obtained by setting the
 GNUTLS_NO_EXPLICIT_INIT environment variable to 1, or by using the macro GNUTLS_SKIP_GLOBAL_INIT
-in a global section of your program.}. 
+in a global section of your program --the latter works in systems with
+support for weak symbols only.}. 
 The initialization typically enables CPU-specific acceleration, performs any required
 precalculations needed, opens any required system devices (e.g., /dev/urandom on Linux)
 and initializes subsystems that could be used later.
 
 The resources allocated by the initialization process will be released 
-on library deinitialization, or explicitly by calling @funcref{gnutls_global_deinit}.
+on library deinitialization.
 
-Note that during initialization file descriptors may be kept open by
+Note that on certain systems file descriptors may be kept open by
 GnuTLS (e.g. /dev/urandom) on library load. Applications closing all unknown file
 descriptors must immediately call @funcref{gnutls_global_init}, after that, to
 ensure they don't disrupt GnuTLS' operation.

diff --git a/lib/locks.c b/lib/locks.c
index 8b94b6c62abc7c392c1b9baa168fbf2beef90e68..494199a5a1c3aae2198aaf1c0ac5f189cd2ddf65 100644 (file)
--- a/lib/locks.c
+++ b/lib/locks.c
@@ -43,6 +43,10 @@
  * unless really needed to. GnuTLS will use the appropriate locks for the running
  * system.
  *
+ * Note that since the move to implicit initialization of GnuTLS on library
+ * load, calling this function will deinitialize the library, and re-initialize
+ * it after the new locking functions are set.
+ *
  * This function must be called prior to any other gnutls function.
  * 
  * Since: 2.12.0