From fb29325f1d4feba6c3f52b690d3da5d492618c4f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 16:46:02 +0100
Subject: r26312: Move specification of port higher up the call stack. (This
 used to be commit 49be7e43ff52a75cb9b4b9e2c3d4c339dbd69416)

---
 source4/utils/nmblookup.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/utils/nmblookup.c')

diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index 2ff758d3b0..c0fb31a21f 100644
--- a/source4/utils/nmblookup.c
+++ b/source4/utils/nmblookup.c
@@ -179,7 +179,7 @@ static NTSTATUS do_node_query(struct nbt_name_socket *nbtsock,
 }
 
 
-static bool process_one(const char *name)
+static bool process_one(const char *name, int nbt_port)
 {
 	TALLOC_CTX *tmp_ctx = talloc_new(NULL);
 	enum nbt_name_type node_type = NBT_NAME_CLIENT;
@@ -235,17 +235,17 @@ static bool process_one(const char *name)
 	}
 
 	if (options.broadcast_address) {
-		status = do_node_query(nbtsock, options.broadcast_address, lp_nbt_port(global_loadparm),
+		status = do_node_query(nbtsock, options.broadcast_address, nbt_port,
 				       node_name, node_type, true);
 	} else if (options.unicast_address) {
 		status = do_node_query(nbtsock, options.unicast_address, 
-				       lp_nbt_port(global_loadparm), node_name, node_type, false);
+				       nbt_port, node_name, node_type, false);
 	} else {
 		int i, num_interfaces = iface_count();
 		for (i=0;i<num_interfaces;i++) {
 			const char *bcast = iface_n_bcast(i);
 			if (bcast == NULL) continue;
-			status = do_node_query(nbtsock, bcast, lp_nbt_port(global_loadparm),
+			status = do_node_query(nbtsock, bcast, nbt_port, 
 					       node_name, node_type, true);
 			if (NT_STATUS_IS_OK(status)) break;
 		}
@@ -353,7 +353,7 @@ int main(int argc, const char *argv[])
 	while (poptPeekArg(pc)) {
 		const char *name = poptGetArg(pc);
 
-		ret &= process_one(name);
+		ret &= process_one(name, lp_nbt_port(global_loadparm));
 	}
 
 	poptFreeContext(pc);
-- 
cgit