Module Name: src
Committed By: roy
Date: Tue May 12 14:05:29 UTC 2015
Modified Files:
src/sbin/ifconfig: af_inet.c af_inet6.c
Log Message:
ioctl -> prog_ioctl as pointed out by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/ifconfig/af_inet6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.16 src/sbin/ifconfig/af_inet.c:1.17
--- src/sbin/ifconfig/af_inet.c:1.16 Sat May 2 14:43:51 2015
+++ src/sbin/ifconfig/af_inet.c Tue May 12 14:05:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.16 2015/05/02 14:43:51 roy Exp $ */
+/* $NetBSD: af_inet.c,v 1.17 2015/05/12 14:05:29 roy Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.16 2015/05/02 14:43:51 roy Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.17 2015/05/12 14:05:29 roy Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -232,7 +232,7 @@ in_addr_tentative(struct ifaddrs *ifa)
ifr.ifr_addr = *ifa->ifa_addr;
if ((s = getsock(AF_INET)) == -1)
err(EXIT_FAILURE, "%s: getsock", __func__);
- if (ioctl(s, SIOCGIFAFLAG_IN, &ifr) == -1)
+ if (prog_ioctl(s, SIOCGIFAFLAG_IN, &ifr) == -1)
err(EXIT_FAILURE, "SIOCGIFAFLAG_IN");
return ifr.ifr_addrflags & IN_IFF_TENTATIVE ? true : false;
#else
Index: src/sbin/ifconfig/af_inet6.c
diff -u src/sbin/ifconfig/af_inet6.c:1.32 src/sbin/ifconfig/af_inet6.c:1.33
--- src/sbin/ifconfig/af_inet6.c:1.32 Wed Apr 22 17:42:22 2015
+++ src/sbin/ifconfig/af_inet6.c Tue May 12 14:05:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet6.c,v 1.32 2015/04/22 17:42:22 roy Exp $ */
+/* $NetBSD: af_inet6.c,v 1.33 2015/05/12 14:05:29 roy Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_inet6.c,v 1.32 2015/04/22 17:42:22 roy Exp $");
+__RCSID("$NetBSD: af_inet6.c,v 1.33 2015/05/12 14:05:29 roy Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -487,7 +487,7 @@ in6_addr_tentative(struct ifaddrs *ifa)
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
ifr.ifr_addr = *(struct sockaddr_in6 *)ifa->ifa_addr;
- if (ioctl(s, SIOCGIFAFLAG_IN6, &ifr) == -1)
+ if (prog_ioctl(s, SIOCGIFAFLAG_IN6, &ifr) == -1)
err(EXIT_FAILURE, "SIOCGIFAFLAG_IN6");
return ifr.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE ? true : false;
}
