[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  dcc94f0 s4-nbt: Ensure source4/ nbt client and server honour 'disable netbios'
      from  6dfb35f Fallback to the internal resolver on EAI_FAIL.

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


- Log -----------------------------------------------------------------
commit dcc94f093317ffa2bbbc776fb82657088eb63305
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Feb 6 20:58:18 2013 +1100

    s4-nbt: Ensure source4/ nbt client and server honour 'disable netbios'
    
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sun Feb 17 11:25:34 CET 2013 on sn-devel-104

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

Summary of changes:
 source4/libcli/resolve/resolve_lp.c |    8 ++++++--
 source4/nbt_server/nbt_server.c     |    5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/resolve/resolve_lp.c b/source4/libcli/resolve/resolve_lp.c
index 69c05a2..92e11f0 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")) {
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 175ad5e..232fb9d 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);


-- 
Samba Shared Repository