summaryrefslogtreecommitdiff
path: root/source4/libcli/resolve
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-13 20:24:37 +0200
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:43:00 +0100
commitb09047b78e981af8ade6a72d426bfcb0e742995b (patch)
tree2547a72c9814f190d83cb0f8ecac678976a72ff5 /source4/libcli/resolve
parent8517878144973aa23e653bfc7aabfbaef500c7e2 (diff)
downloadsamba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz
samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.bz2
samba-b09047b78e981af8ade6a72d426bfcb0e742995b.zip
r25624: Remove ipv4_addr hack. Only causes 4 extra includes of system/network.h because we stripped down includes.
(This used to be commit 262c1c23a61f1f4fae13e0a61179fe98b682cecf)
Diffstat (limited to 'source4/libcli/resolve')
-rw-r--r--source4/libcli/resolve/host.c4
-rw-r--r--source4/libcli/resolve/resolve.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index ec394309ef..e98bbc51b2 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -65,14 +65,14 @@ static int host_destructor(struct host_state *state)
static void run_child(struct composite_context *c, int fd)
{
struct host_state *state = talloc_get_type(c->private_data, struct host_state);
- struct ipv4_addr ip;
+ struct in_addr ip;
const char *address;
/* this is the blocking call we are going to lots of trouble
to avoid in the parent */
ip = interpret_addr2(state->name.name);
- address = sys_inet_ntoa(ip);
+ address = inet_ntoa(ip);
if (address != NULL) {
write(fd, address, strlen(address)+1);
}
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 02e1fbdc04..24113db9f0 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -25,6 +25,7 @@
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "param/param.h"
+#include "system/network.h"
struct resolve_state {
struct nbt_name name;
@@ -151,8 +152,8 @@ struct composite_context *resolve_name_send(struct nbt_name *name, struct event_
if (is_ipaddress(state->name.name) ||
strcasecmp(state->name.name, "localhost") == 0) {
- struct ipv4_addr ip = interpret_addr2(state->name.name);
- state->reply_addr = talloc_strdup(state, sys_inet_ntoa(ip));
+ struct in_addr ip = interpret_addr2(state->name.name);
+ state->reply_addr = talloc_strdup(state, inet_ntoa(ip));
if (composite_nomem(state->reply_addr, c)) return c;
composite_done(c);
return c;