X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.c;h=05d4b2d66bd8a047bc467cb5c69353e0503519b8;hb=7156ac005bdcae789c0033d0c6e3b57f1f764a1c;hp=b65b53f7ed6bb568d6592d0bc9d0f249f39ebf13;hpb=7944a13a2b8516d5fa354703789f5988cb4299b6;p=elogind.git

diff --git a/udev/udevd.c b/udev/udevd.c
index b65b53f7e..05d4b2d66 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -1349,7 +1349,7 @@ int main(int argc, char *argv[])
 
 	if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) {
 		/* get control and netlink socket from from systemd */
-		udev_ctrl = udev_ctrl_new_from_socket_fd(udev, UDEV_CTRL_SOCK_PATH, fd_ctrl);
+		udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl);
 		if (udev_ctrl == NULL) {
 			err(udev, "error taking over udev control socket");
 			rc = 1;
@@ -1364,7 +1364,7 @@ int main(int argc, char *argv[])
 		}
 	} else {
 		/* open control and netlink socket */
-		udev_ctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+		udev_ctrl = udev_ctrl_new(udev);
 		if (udev_ctrl == NULL) {
 			fprintf(stderr, "error initializing udev control socket");
 			err(udev, "error initializing udev control socket");
@@ -1420,7 +1420,7 @@ int main(int argc, char *argv[])
 			goto exit;
 		default:
 			rc = EXIT_SUCCESS;
-			goto exit_keep_queue;
+			goto exit_daemonize;
 		}
 
 		setsid();
@@ -1648,10 +1648,11 @@ int main(int argc, char *argv[])
 			struct udev_device *dev;
 
 			dev = udev_monitor_receive_device(monitor);
-			if (dev != NULL)
+			if (dev != NULL) {
 				udev_device_set_usec_initialized(dev, now_usec());
 				if (event_queue_insert(dev) < 0)
 					udev_device_unref(dev);
+			}
 		}
 
 		/* start new events */
@@ -1704,7 +1705,8 @@ int main(int argc, char *argv[])
 	rc = EXIT_SUCCESS;
 exit:
 	udev_queue_export_cleanup(udev_queue_export);
-exit_keep_queue:
+	udev_ctrl_cleanup(udev_ctrl);
+exit_daemonize:
 	if (fd_ep >= 0)
 		close(fd_ep);
 	worker_list_cleanup(udev);