summaryrefslogtreecommitdiff
path: root/source4/nbt_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-02-06 20:58:18 +1100
committerAndrew Bartlett <abartlet@samba.org>2013-02-17 11:25:34 +0100
commitdcc94f093317ffa2bbbc776fb82657088eb63305 (patch)
tree294e41f147a7e012b26748f7faa5681e33134c64 /source4/nbt_server
parent6dfb35f3ff7ad2d2089c0a3e5eab342384e45e4c (diff)
downloadsamba-dcc94f093317ffa2bbbc776fb82657088eb63305.tar.gz
s4-nbt: Ensure source4/ nbt client and server honour 'disable netbios'
Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sun Feb 17 11:25:34 CET 2013 on sn-devel-104
Diffstat (limited to 'source4/nbt_server')
-rw-r--r--source4/nbt_server/nbt_server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 175ad5e4a43..232fb9de13a 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -48,6 +48,11 @@ static void nbtd_task_init(struct task_server *task)
return;
}
+ if (lpcfg_disable_netbios(task->lp_ctx)) {
+ task_server_terminate(task, "nbtd: 'disable netbios = yes' set in smb.conf, shutting down nbt server", false);
+ return;
+ }
+
task_server_set_title(task, "task[nbtd]");
nbtsrv = talloc(task, struct nbtd_server);