From dcc94f093317ffa2bbbc776fb82657088eb63305 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 6 Feb 2013 20:58:18 +1100 Subject: s4-nbt: Ensure source4/ nbt client and server honour 'disable netbios' Reviewed-by: Stefan Metzmacher Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sun Feb 17 11:25:34 CET 2013 on sn-devel-104 --- source4/libcli/resolve/resolve_lp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/resolve/resolve_lp.c b/source4/libcli/resolve/resolve_lp.c index 69c05a2ea0..92e11f0fcb 100644 --- a/source4/libcli/resolve/resolve_lp.c +++ b/source4/libcli/resolve/resolve_lp.c @@ -32,9 +32,13 @@ struct resolve_context *lpcfg_resolve_context(struct loadparm_context *lp_ctx) for (i = 0; methods != NULL && methods[i] != NULL; i++) { if (!strcmp(methods[i], "wins")) { - resolve_context_add_wins_method_lp(ret, lp_ctx); + if (lpcfg_disable_netbios(lp_ctx) == false) { + resolve_context_add_wins_method_lp(ret, lp_ctx); + } } else if (!strcmp(methods[i], "bcast")) { - resolve_context_add_bcast_method_lp(ret, lp_ctx); + if (lpcfg_disable_netbios(lp_ctx) == false) { + resolve_context_add_bcast_method_lp(ret, lp_ctx); + } } else if (!strcmp(methods[i], "file")) { resolve_context_add_file_method_lp(ret, lp_ctx); } else if (!strcmp(methods[i], "host")) { -- cgit