summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2012-04-05 16:01:13 -0500
committerMike Christie <michaelc@cs.wisc.edu>2012-04-05 16:01:13 -0500
commit6676a1cf6f2d23961e9db70155b5d0e5ce511989 (patch)
treefe9a893c2ee62a823c89420facc810865958dc7f
parentb082070000d0c02c5c59dca69d1e4e907546616c (diff)
downloadopen-iscsi-6676a1cf6f2d23961e9db70155b5d0e5ce511989.tar.gz
iscsi tools: use strlpy in net code
Use strlcpy in net code like is done in other code.
-rw-r--r--usr/iscsi_net_util.c10
1 files changed, 5 insertions, 5 deletions
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)",