[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c324f84a2fa s3:libsmb: Honor disable_netbios option in smbsock_connect_send
      from  193a0d6f013 ctdb: Print locks latency in machinereadable stats

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


- Log -----------------------------------------------------------------
commit c324f84a2fa25e29d2f7879fbcd35ce0e76a78f8
Author: Justin Stephenson <jstephen at redhat.com>
Date:   Mon Jan 14 10:36:47 2019 -0500

    s3:libsmb: Honor disable_netbios option in smbsock_connect_send
    
    If disable_netbios is set, return before the tevent timer is triggered
    to prevent outgoing netbios connections.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13727
    
    Signed-off-by: Justin Stephenson <jstephen at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jan 16 08:54:23 CET 2019 on sn-devel-144

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

Summary of changes:
 source3/libsmb/smbsock_connect.c | 7 +++++++
 1 file changed, 7 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index bb3cb07646c..be52b9a4f79 100644
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -415,6 +415,13 @@ struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
 	tevent_req_set_callback(state->req_445, smbsock_connect_connected,
 				req);
 
+	/*
+	 * Check for disable_netbios
+	 */
+	if (lp_disable_netbios()) {
+		return req;
+	}
+
 	/*
 	 * After 5 msecs, fire the 139 (NBT) request
 	 */


-- 
Samba Shared Repository