diff options
| author | Noel Power <noel.power@suse.com> | 2016-11-10 08:27:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-11-15 01:14:21 +0100 |
| commit | 15fa802c771513fa535f9c825bcbdcdcc73ae66a (patch) | |
| tree | 79db848906d1ce16e5eb0b4a165b17538300369a /source3/client | |
| parent | cc081c78316d06d0cbbaf986863315db472a9cbe (diff) | |
| download | samba-15fa802c771513fa535f9c825bcbdcdcc73ae66a.tar.gz | |
s3/client: obey 'disable netbios' smb.conf param, don't connect via NBT port.
If 'disable netbios' is true 'smbclient -L //server' will try use the NBT
port to list the servers and 'smbclient -M //server' use the netbios
messaging WinPopup facility, we should honour the config and not do that.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12418
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 78862eecc67..ecfd27c72f3 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5598,6 +5598,10 @@ static int do_host_query(const char *query_host) } } + if (lp_disable_netbios()) { + goto out; + } + if (port != NBT_SMB_PORT) { /* Workgroups simply don't make sense over anything @@ -5621,7 +5625,7 @@ static int do_host_query(const char *query_host) cli_set_timeout(cli, io_timeout*1000); list_servers(lp_workgroup()); - +out: cli_shutdown(cli); return(0); @@ -5676,6 +5680,11 @@ static int do_message_op(struct user_auth_info *a_info) { NTSTATUS status; + if (lp_disable_netbios()) { + d_printf("NetBIOS over TCP disabled.\n"); + return 1; + } + status = cli_connect_nb(desthost, have_ip ? &dest_ss : NULL, port ? port : NBT_SMB_PORT, name_type, lp_netbios_name(), SMB_SIGNING_DEFAULT, 0, &cli); |