diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-11 22:23:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:33 +0100 |
| commit | 70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1 (patch) | |
| tree | 8003912164545843cab60521541e5f068708a5d8 /source4/libcli | |
| parent | 6f2252dace1629d7b5c5637b103caa28d2c89b07 (diff) | |
| download | samba-70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1.tar.gz samba-70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1.tar.bz2 samba-70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1.zip | |
r26402: Require a talloc context in libnetif.
(This used to be commit a35e51871bbf1ab33fc316fa59e597b722769c50)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/resolve/bcast.c | 2 | ||||
| -rw-r--r-- | source4/libcli/resolve/nbtlist.c | 3 | ||||
| -rw-r--r-- | source4/libcli/wrepl/winsrepl.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c index d1f3d65faf..1dd9328760 100644 --- a/source4/libcli/resolve/bcast.c +++ b/source4/libcli/resolve/bcast.c @@ -86,7 +86,7 @@ NTSTATUS resolve_name_bcast(struct nbt_name *name, bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct loadparm_context *lp_ctx) { struct interface *ifaces; - load_interfaces(lp_interfaces(lp_ctx), &ifaces); + load_interfaces(ctx, lp_interfaces(lp_ctx), &ifaces); return resolve_context_add_method(ctx, resolve_name_bcast_send, resolve_name_bcast_recv, ifaces); } diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index 6c12fe706b..595743e693 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -76,7 +76,7 @@ static void nbtlist_handler(struct nbt_name_request *req) } /* favor a local address if possible */ - load_interfaces(lp_interfaces(global_loadparm), &ifaces); + load_interfaces(NULL, lp_interfaces(global_loadparm), &ifaces); state->reply_addr = NULL; for (i=0;i<q->out.num_addrs;i++) { if (iface_is_local(ifaces, q->out.reply_addrs[i])) { @@ -85,6 +85,7 @@ static void nbtlist_handler(struct nbt_name_request *req) break; } } + talloc_free(ifaces); if (state->reply_addr == NULL) { state->reply_addr = talloc_steal(state, diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 15dc98f675..63b0a60f6c 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -334,7 +334,7 @@ struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket, if (!our_ip) { struct interface *ifaces; - load_interfaces(lp_interfaces(global_loadparm), &ifaces); + load_interfaces(state, lp_interfaces(global_loadparm), &ifaces); our_ip = iface_best_ip(ifaces, peer_ip); } |