summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-10-13 16:50:31 +0200
committerVolker Lendecke <vl@sernet.de>2007-10-13 21:44:58 +0200
commit478ad87cb39d794f596316ba24d73c24d23a159a (patch)
tree2b9fe8a32cfda824088b055632507c5eae882dd3
parent70b416a1742e28b43cf82511277b57ff04affece (diff)
downloadsamba-478ad87cb39d794f596316ba24d73c24d23a159a.tar.gz
samba-478ad87cb39d794f596316ba24d73c24d23a159a.tar.bz2
samba-478ad87cb39d794f596316ba24d73c24d23a159a.zip
Use strlcpy instead of strncpy
(This used to be commit 5e95c548864bc8b075b8343e69a69e1a22c92456)
-rw-r--r--source3/lib/interfaces.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index 122101cdc9..2b93a5ba39 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -85,6 +85,7 @@
#endif
#include "interfaces.h"
+#include "lib/replace/replace.h"
/****************************************************************************
Try the "standard" getifaddrs/freeifaddrs interfaces.
@@ -150,9 +151,8 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
continue;
}
- strncpy(ifaces[total].name, ifptr->ifa_name,
- sizeof(ifaces[total].name)-1);
- ifaces[total].name[sizeof(ifaces[total].name)-1] = 0;
+ strlcpy(ifaces[total].name, ifptr->ifa_name,
+ sizeof(ifaces[total].name));
total++;
}
@@ -218,9 +218,8 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
continue;
}
- strncpy(ifaces[total].name, ifr[i].ifr_name,
- sizeof(ifaces[total].name)-1);
- ifaces[total].name[sizeof(ifaces[total].name)-1] = 0;
+ strlcpy(ifaces[total].name, ifr[i].ifr_name,
+ sizeof(ifaces[total].name));
memcpy(&ifaces[total].ip, &ifr[i].ifr_addr,
sizeof(struct sockaddr_in));
@@ -331,9 +330,7 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
continue;
}
- strncpy(ifaces[total].name, iname,
- sizeof(ifaces[total].name)-1);
- ifaces[total].name[sizeof(ifaces[total].name)-1] = 0;
+ strlcpy(ifaces[total].name, iname, sizeof(ifaces[total].name));
memcpy(&ifaces[total].ip, &ifreq.ifr_addr,
sizeof(struct sockaddr_in));
@@ -436,9 +433,8 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
memcpy(&ifaces[total].ip, &ifr->ifr_addr,
sizeof(struct sockaddr_in));
- strncpy(ifaces[total].name, ifr->ifr_name,
- sizeof(ifaces[total].name)-1);
- ifaces[total].name[sizeof(ifaces[total].name)-1] = 0;
+ strlcpy(ifaces[total].name, ifr->ifr_name,
+ sizeof(ifaces[total].name));
if (ioctl(fd, SIOCGIFNETMASK, ifr) != 0) {
goto next;