From: Rui Chen Date: Sun, 15 Sep 2024 21:03:59 +0000 (-0400) Subject: fix build failures X-Git-Url: https://www.tinc-vpn.org/git/?a=commitdiff_plain;h=75a50db4c712401bf6ef8f0711fb9a9abb694a67;p=tinc fix build failures seeing some build failure while building for macos sequoia, the error is below: ``` net_socket.c:105:14: error: no member named 'ifr_ifrn' in 'struct ifreq' 105 | strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); | ~~~ ^ /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_string.h:128:28: note: expanded from macro 'strncpy' 128 | __builtin___strncpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest)) | ^~~~ net_socket.c:105:14: error: no member named 'ifr_ifrn' in 'struct ifreq' 105 | strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); | ~~~ ^ /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_string.h:128:62: note: expanded from macro 'strncpy' 128 | __builtin___strncpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest)) | ^~~~ /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_common.h:41:54: note: expanded from macro '__darwin_obsz' 41 | #define __darwin_obsz(object) __builtin_object_size (object, _USE_FORTIFY_LEVEL > 1 ? 1 : 0) | ^~~~~~ ``` full build log, https://github.com/Homebrew/homebrew-core/actions/runs/10837004674/job/30072048690 Signed-off-by: Rui Chen --- diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c index 45676a1e..fb54557b 100644 --- a/src/raw_socket_device.c +++ b/src/raw_socket_device.c @@ -57,8 +57,8 @@ static bool setup_device(void) { fcntl(device_fd, F_SETFD, FD_CLOEXEC); #endif - strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); - ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0; + strncpy(ifr.ifr_name, iface, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ - 1] = 0; if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) { close(device_fd);