From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Fri, 20 Dec 2013 15:16:11 +0000 (+0200)
Subject: libsystemd-dhcp: Return proper error if bind fails
X-Git-Tag: v209~731
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1c8035a89747ed3aadc433bdd11b865cd0d02472

libsystemd-dhcp: Return proper error if bind fails

This also fixes a minor indentation damage.

[tomegun: use close_noint_nofail() instead and drop 'err' variables]
---

diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd-dhcp/dhcp-network.c
index 83a30842c..7fecf270f 100644
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd-dhcp/dhcp-network.c
@@ -31,7 +31,7 @@
 #include "dhcp-internal.h"
 
 int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
- {
+{
         int s;
 
         s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
@@ -46,7 +46,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
         memset(link->ll.sll_addr, 0xff, ETH_ALEN);
 
         if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
-                close(s);
+                close_nointr_nofail(s);
                 return -errno;
         }
 
@@ -56,10 +56,8 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
 int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
                                  const void *packet, size_t len)
 {
-        int err = 0;
-
         if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
-                err = -errno;
+                return -errno;
 
-        return err;
+        return 0;
 }