Revert "nhrpd: strncpy -> strlcpy"

This reverts commit eb266ecb847b70bcf9901da5ed59a39d3e07fd8f.

diff --git a/nhrpd/linux.c b/nhrpd/linux.c
index bb5ce0fec6b2c41e65a087a8c020e1ecbf33b0c2..85e941e7bacd1d63fed3300fe7e708df39c4f420 100644 (file)
--- a/nhrpd/linux.c
+++ b/nhrpd/linux.c
@@ -110,7 +110,7 @@ static int linux_configure_arp(const char *iface, int on)
 {
        struct ifreq ifr;
 
-       strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
+       strncpy(ifr.ifr_name, iface, IFNAMSIZ - 1);
        if (ioctl(nhrp_socket_fd, SIOCGIFFLAGS, &ifr))
                return -1;
 

diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index fab99588c86cb10a08109f9d20172f46bbd1973c..3de4609a2bc435966bbb18d6881b370db08b14d7 100644 (file)
--- a/nhrpd/vici.c
+++ b/nhrpd/vici.c
@@ -550,7 +550,7 @@ int sock_open_unix(const char *path)
 
        memset(&addr, 0, sizeof(struct sockaddr_un));
        addr.sun_family = AF_UNIX;
-       strlcpy(addr.sun_path, path, sizeof(addr.sun_path));
+       strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
 
        ret = connect(fd, (struct sockaddr *)&addr,
                      sizeof(addr.sun_family) + strlen(addr.sun_path));