diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-13 20:24:37 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:00 +0100 |
| commit | b09047b78e981af8ade6a72d426bfcb0e742995b (patch) | |
| tree | 2547a72c9814f190d83cb0f8ecac678976a72ff5 /source4/nbt_server | |
| parent | 8517878144973aa23e653bfc7aabfbaef500c7e2 (diff) | |
| download | samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.xz 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/nbt_server')
| -rw-r--r-- | source4/nbt_server/interfaces.c | 2 | ||||
| -rw-r--r-- | source4/nbt_server/wins/winsserver.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c index f2a875142a..2f51cc3dec 100644 --- a/source4/nbt_server/interfaces.c +++ b/source4/nbt_server/interfaces.c @@ -233,7 +233,7 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv) if (num_interfaces > 0) { primary_address = iface_n_ip(0); } else { - primary_address = sys_inet_ntoa(interpret_addr2( + primary_address = inet_ntoa(interpret_addr2( lp_netbios_name(global_loadparm))); } primary_address = talloc_strdup(tmp_ctx, primary_address); diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c index 2ff5e3f69b..bce80702df 100644 --- a/source4/nbt_server/wins/winsserver.c +++ b/source4/nbt_server/wins/winsserver.c @@ -560,13 +560,13 @@ done: nbtd_name_registration_reply(nbtsock, packet, src, rcode); } -static uint32_t ipv4_match_bits(struct ipv4_addr ip1,struct ipv4_addr ip2) +static uint32_t ipv4_match_bits(struct in_addr ip1, struct in_addr ip2) { uint32_t i, j, match=0; uint8_t *p1, *p2; - p1 = (uint8_t *)&ip1.addr; - p2 = (uint8_t *)&ip2.addr; + p1 = (uint8_t *)&ip1.s_addr; + p2 = (uint8_t *)&ip2.s_addr; for (i=0; i<4; i++) { if (p1[i] != p2[i]) break; |