libudev: ctrl, monitor - use SOCK_NONBLOCK

diff --git a/NEWS b/NEWS
index ccbaa46cd94cfd3356973229f5d7f31120b8c033..afec73c3e5dbd17ef705a2fb38447c6851a773b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ udevadm control --exit
 udevadm info --cleanup-db
 
 systemd netlink socket activation
+stop socket or mask on rpm update
 requires systemd 25
 
 udev 167

diff --git a/libudev/libudev-ctrl.c b/libudev/libudev-ctrl.c
index 7fa2d1d535cd7ad38c49b75d34f77ba37518e129..a2133fff1c7b313b36aeeb7376c2fcf88b25a4b2 100644 (file)
--- a/libudev/libudev-ctrl.c
+++ b/libudev/libudev-ctrl.c
@@ -91,7 +91,7 @@ struct udev_ctrl *udev_ctrl_new_from_socket_fd(struct udev *udev, const char *so
                return NULL;
 
        if (fd < 0) {
-               uctrl->sock = socket(AF_LOCAL, SOCK_SEQPACKET|SOCK_CLOEXEC, 0);
+               uctrl->sock = socket(AF_LOCAL, SOCK_SEQPACKET|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
                if (uctrl->sock < 0) {
                        err(udev, "error getting socket: %m\n");
                        udev_ctrl_unref(uctrl);

diff --git a/libudev/libudev-monitor.c b/libudev/libudev-monitor.c
index 5d9e155722dd4b06203132dfda400c5cf02ab23e..d890b4b142bd5f1dba57ce8fb02712ad20715784 100644 (file)
--- a/libudev/libudev-monitor.c
+++ b/libudev/libudev-monitor.c
@@ -145,7 +145,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
                util_strscpy(&udev_monitor->sun.sun_path[1], sizeof(udev_monitor->sun.sun_path)-1, socket_path);
                udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path)+1;
        }
-       udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+       udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
        if (udev_monitor->sock == -1) {
                err(udev, "error getting socket: %m\n");
                free(udev_monitor);