diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 03:58:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:15 -0500 |
| commit | 5011f901aa0140ed60a0b58e80ab0f14810ba432 (patch) | |
| tree | 379ad85e8627394a47bbac5e783e0955a5a5d481 /source4/lib/util.c | |
| parent | 2f7d7e47e38d88655baddad4e2e0572d4c158f70 (diff) | |
| download | samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.tar.gz samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.tar.bz2 samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.zip | |
r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh.
(This used to be commit 7842b23d01c53009259a2461600bd01159cecebf)
Diffstat (limited to 'source4/lib/util.c')
| -rw-r--r-- | source4/lib/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/util.c b/source4/lib/util.c index 2ce34f58d9..5385174ce4 100644 --- a/source4/lib/util.c +++ b/source4/lib/util.c @@ -452,7 +452,7 @@ struct ipv4_addr interpret_addr2(const char *str) { struct ipv4_addr ret; uint32_t a = interpret_addr(str); - ret.s_addr = a; + ret.addr = a; return ret; } @@ -486,9 +486,9 @@ BOOL same_net(struct ipv4_addr ip1,struct ipv4_addr ip2,struct ipv4_addr mask) { uint32_t net1,net2,nmask; - nmask = ntohl(mask.s_addr); - net1 = ntohl(ip1.s_addr); - net2 = ntohl(ip2.s_addr); + nmask = ntohl(mask.addr); + net1 = ntohl(ip1.addr); + net2 = ntohl(ip2.addr); return((net1 & nmask) == (net2 & nmask)); } |