summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/netif/interface.c5
-rw-r--r--source4/lib/pidfile.c2
-rw-r--r--source4/lib/util.c6
3 files changed, 6 insertions, 7 deletions
diff --git a/source4/lib/netif/interface.c b/source4/lib/netif/interface.c
index 31354e359a..2d90df43cf 100644
--- a/source4/lib/netif/interface.c
+++ b/source4/lib/netif/interface.c
@@ -272,8 +272,9 @@ BOOL interfaces_changed(void)
BOOL ismyip(struct ipv4_addr ip)
{
struct interface *i;
- for (i=local_interfaces;i;i=i->next)
- if (ipv4_equal(i->ip,ip)) return True;
+ for (i=local_interfaces;i;i=i->next) {
+ if (i->ip.addr == ip.addr) return True;
+ }
return False;
}
diff --git a/source4/lib/pidfile.c b/source4/lib/pidfile.c
index ff05c0606e..b1866ee6af 100644
--- a/source4/lib/pidfile.c
+++ b/source4/lib/pidfile.c
@@ -44,7 +44,7 @@ pid_t pidfile_pid(const char *name)
return 0;
}
- ZERO_ARRAY(pidstr);
+ ZERO_STRUCT(pidstr);
if (read(fd, pidstr, sizeof(pidstr)-1) <= 0) {
goto noproc;
diff --git a/source4/lib/util.c b/source4/lib/util.c
index d95924670f..93559d9518 100644
--- a/source4/lib/util.c
+++ b/source4/lib/util.c
@@ -410,7 +410,7 @@ uint32_t interpret_addr(const char *str)
DEBUG(3,("sys_gethostbyname: host address is invalid for host %s\n",str));
return 0;
}
- putip((char *)&res,(char *)hp->h_addr);
+ memcpy((char *)&res,(char *)hp->h_addr, 4);
}
if (res == (uint32_t)-1)
@@ -436,9 +436,7 @@ struct ipv4_addr interpret_addr2(const char *str)
BOOL is_zero_ip(struct ipv4_addr ip)
{
- uint32_t a;
- putip((char *)&a,(char *)&ip);
- return(a == 0);
+ return ip.addr == 0;
}
/*******************************************************************