[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  456c69f s4:lib/tls - call "gnutls_transport_set_lowat" only on GNUTLS < 3.0
      from  9c4d498 s3-waf: fix the build with CTDB_CONTROL_CHECK_SRVIDS.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 456c69f95e7a672c4cc9a5e6e52fb37e14012304
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Nov 28 20:55:37 2011 +0100

    s4:lib/tls - call "gnutls_transport_set_lowat" only on GNUTLS < 3.0
    
    This function call together with the lowat feature has been removed in release
    3.0 as described in this mailing list post:
    http://old.nabble.com/gnutls_transport_set_lowat-deprecated-td32554230.html.
    
    Since we do not make any use of lowat (esprimed by each function call)
    we are free to simply omit it on v3.0 and later.
    
    This addresses bug #8537.
    
    Reviewed by: abartlet + metze
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Wed Nov 30 20:11:14 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/tls/tls.c         |    4 ++++
 source4/lib/tls/tls_tstream.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 00c2d13..3a49e2f 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -505,7 +505,9 @@ struct socket_context *tls_init_server(struct tls_params *params,
 	gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls);
 	gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull);
 	gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push);
+#if GNUTLS_VERSION_MAJOR < 3
 	gnutls_transport_set_lowat(tls->session, 0);
+#endif
 
 	tls->plain_chars = plain_chars;
 	if (plain_chars) {
@@ -574,7 +576,9 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx,
 	gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls);
 	gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull);
 	gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push);
+#if GNUTLS_VERSION_MAJOR < 3
 	gnutls_transport_set_lowat(tls->session, 0);
+#endif
 	tls->tls_detect = false;
 
 	tls->output_pending  = false;
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index c64b2ea..eb4a6d9 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -1029,7 +1029,9 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
 					   (gnutls_pull_func)tstream_tls_pull_function);
 	gnutls_transport_set_push_function(tlss->tls_session,
 					   (gnutls_push_func)tstream_tls_push_function);
+#if GNUTLS_VERSION_MAJOR < 3
 	gnutls_transport_set_lowat(tlss->tls_session, 0);
+#endif
 
 	tlss->handshake.req = req;
 	tstream_tls_retry_handshake(state->tls_stream);
@@ -1278,7 +1280,9 @@ struct tevent_req *_tstream_tls_accept_send(TALLOC_CTX *mem_ctx,
 					   (gnutls_pull_func)tstream_tls_pull_function);
 	gnutls_transport_set_push_function(tlss->tls_session,
 					   (gnutls_push_func)tstream_tls_push_function);
+#if GNUTLS_VERSION_MAJOR < 3
 	gnutls_transport_set_lowat(tlss->tls_session, 0);
+#endif
 
 	tlss->handshake.req = req;
 	tstream_tls_retry_handshake(state->tls_stream);


-- 
Samba Shared Repository