diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 23:57:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:37 +0100 |
| commit | c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124 (patch) | |
| tree | a8f2d25736e2edb08fc4b03b21f3a2949b1e2117 /source4/nbt_server/interfaces.c | |
| parent | 04304808cabd0f05a5ff5bf23d8fd950eff8d6f3 (diff) | |
| download | samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.tar.gz samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.tar.bz2 samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.zip | |
r26325: Remove use of global_loadparm in netif.
(This used to be commit e452cb28594f23add7c00247ed39e8323aea78a6)
Diffstat (limited to 'source4/nbt_server/interfaces.c')
| -rw-r--r-- | source4/nbt_server/interfaces.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c index c40cd6322c..21ebada3c8 100644 --- a/source4/nbt_server/interfaces.c +++ b/source4/nbt_server/interfaces.c @@ -218,7 +218,7 @@ static NTSTATUS nbtd_add_wins_socket(struct nbtd_server *nbtsrv) */ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv, struct loadparm_context *lp_ctx) { - int num_interfaces = iface_count(); + int num_interfaces = iface_count(lp_ctx); int i; TALLOC_CTX *tmp_ctx = talloc_new(nbtsrv); NTSTATUS status; @@ -232,7 +232,7 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv, struct loadparm_con for non-WINS queries not made on a specific interface */ if (num_interfaces > 0) { - primary_address = iface_n_ip(0); + primary_address = iface_n_ip(lp_ctx, 0); } else { primary_address = inet_ntoa(interpret_addr2( lp_netbios_name(lp_ctx))); @@ -250,15 +250,15 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv, struct loadparm_con } for (i=0; i<num_interfaces; i++) { - const char *bcast = iface_n_bcast(i); + const char *bcast = iface_n_bcast(lp_ctx, i); const char *address, *netmask; /* we can't assume every interface is broadcast capable */ if (bcast == NULL) continue; - address = talloc_strdup(tmp_ctx, iface_n_ip(i)); + address = talloc_strdup(tmp_ctx, iface_n_ip(lp_ctx, i)); bcast = talloc_strdup(tmp_ctx, bcast); - netmask = talloc_strdup(tmp_ctx, iface_n_netmask(i)); + netmask = talloc_strdup(tmp_ctx, iface_n_netmask(lp_ctx, i)); status = nbtd_add_socket(nbtsrv, lp_ctx, address, address, bcast, netmask); |