From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 2 Jul 2020 07:03:28 +0000 (+0900)
Subject: util: use setsockopt_int() at one more place
X-Git-Tag: v246-rc1~52^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e958e1d6cf4589cea3dc015ebbe64dc0c08ba1f;p=thirdparty%2Fsystemd.git

util: use setsockopt_int() at one more place
---

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 07f534f34d1..5218374b2b3 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -1130,6 +1130,7 @@ int socket_bind_to_ifname(int fd, const char *ifname) {
 
 int socket_bind_to_ifindex(int fd, int ifindex) {
         char ifname[IF_NAMESIZE + 1];
+        int r;
 
         assert(fd >= 0);
 
@@ -1141,10 +1142,9 @@ int socket_bind_to_ifindex(int fd, int ifindex) {
                 return 0;
         }
 
-        if (setsockopt(fd, SOL_SOCKET, SO_BINDTOIFINDEX, &ifindex, sizeof(ifindex)) >= 0)
-                return 0;
-        if (errno != ENOPROTOOPT)
-                return -errno;
+        r = setsockopt_int(fd, SOL_SOCKET, SO_BINDTOIFINDEX, ifindex);
+        if (r != -ENOPROTOOPT)
+                return r;
 
         /* Fall back to SO_BINDTODEVICE on kernels < 5.0 which didn't have SO_BINDTOIFINDEX */
         if (!format_ifname(ifindex, ifname))