[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7
Mike Christie
michaelc at cs.wisc.edu
Sat Apr 7 15:44:22 UTC 2012
The following commit has been merged in the upstream-mnc branch:
commit 6676a1cf6f2d23961e9db70155b5d0e5ce511989
Author: Mike Christie <michaelc at cs.wisc.edu>
Date: Thu Apr 5 16:01:13 2012 -0500
iscsi tools: use strlpy in net code
Use strlcpy in net code like is done in other code.
diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
index ebdd407..6d0ebf9 100644
--- a/usr/iscsi_net_util.c
+++ b/usr/iscsi_net_util.c
@@ -228,7 +228,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway,
/* Bring up interface */
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
ifr.ifr_flags = IFF_UP | IFF_RUNNING;
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
log_error("Could not bring up netdev %s (err %d - %s)",
@@ -238,7 +238,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway,
}
/* Set IP address */
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
memcpy(&ifr.ifr_addr, &sk_ipaddr, sizeof(struct sockaddr));
if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) {
log_error("Could not set ip for %s (err %d - %s)",
@@ -249,7 +249,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway,
/* Set netmask */
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
memcpy(&ifr.ifr_addr, &sk_netmask, sizeof(struct sockaddr));
if (ioctl(sock, SIOCSIFNETMASK, &ifr) < 0) {
log_error("Could not set ip for %s (err %d - %s)",
@@ -329,7 +329,7 @@ int net_ifup_netdev(char *netdev)
}
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
log_error("Could not bring up netdev %s (err %d - %s)",
netdev, errno, strerror(errno));
@@ -346,7 +346,7 @@ int net_ifup_netdev(char *netdev)
/* Bring up interface */
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
ifr.ifr_flags = IFF_UP;
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
log_error("Could not bring up netdev %s (err %d - %s)",
--
Debian Open-iSCSI Packaging
More information about the Pkg-iscsi-maintainers
mailing list