svn commit: samba r26378 - in branches/SAMBA_4_0: . source/libcli/resolve

jelmer at samba.org jelmer at samba.org
Mon Dec 10 18:41:35 GMT 2007


Author: jelmer
Date: 2007-12-10 18:41:33 +0000 (Mon, 10 Dec 2007)
New Revision: 26378

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26378

Log:
Remove use of global_loadparm.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/libcli/resolve/bcast.c
   branches/SAMBA_4_0/source/libcli/resolve/resolve.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/libcli/resolve/bcast.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/resolve/bcast.c	2007-12-10 18:41:29 UTC (rev 26377)
+++ branches/SAMBA_4_0/source/libcli/resolve/bcast.c	2007-12-10 18:41:33 UTC (rev 26378)
@@ -33,7 +33,8 @@
 						  void *userdata,
 						  struct nbt_name *name)
 {
-	int num_interfaces = iface_count(global_loadparm);
+	struct loadparm_context *lp_ctx = userdata;
+	int num_interfaces = iface_count(lp_ctx);
 	const char **address_list;
 	struct composite_context *c;
 	int i, count=0;
@@ -42,7 +43,7 @@
 	if (address_list == NULL) return NULL;
 
 	for (i=0;i<num_interfaces;i++) {
-		const char *bcast = iface_n_bcast(global_loadparm, i);
+		const char *bcast = iface_n_bcast(lp_ctx, i);
 		if (bcast == NULL) continue;
 		address_list[count] = talloc_strdup(address_list, bcast);
 		if (address_list[count] == NULL) {
@@ -79,8 +80,8 @@
 	return resolve_name_bcast_recv(c, mem_ctx, reply_addr);
 }
 
-bool resolve_context_add_bcast_method(struct resolve_context *ctx)
+bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct loadparm_context *lp_ctx)
 {
 	return resolve_context_add_method(ctx, resolve_name_bcast_send, resolve_name_bcast_recv,
-					  NULL);
+					  lp_ctx);
 }

Modified: branches/SAMBA_4_0/source/libcli/resolve/resolve.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/resolve/resolve.c	2007-12-10 18:41:29 UTC (rev 26377)
+++ branches/SAMBA_4_0/source/libcli/resolve/resolve.c	2007-12-10 18:41:33 UTC (rev 26378)
@@ -241,7 +241,7 @@
 		if (!strcmp(methods[i], "wins")) {
 			resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
 		} else if (!strcmp(methods[i], "bcast")) {
-			resolve_context_add_bcast_method(ret);
+			resolve_context_add_bcast_method(ret, lp_ctx);
 		} else if (!strcmp(methods[i], "host")) {
 			resolve_context_add_host_method(ret);
 		} else {



More information about the samba-cvs mailing list