sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh.

Browse Source
This commit is contained in:
Andrew Tridgell
2004-11-02 03:58:27 +00:00
committed by Gerald (Jerry) Carter
parent 7e94d5bd3d
commit 7842b23d01
12 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/util.c
View File

@ -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));
}