udevd: control - no not delete socket file when --daemon is used

[elogind.git] / udev / udev-ctrl.c

diff --git a/udev/udev-ctrl.c b/udev/udev-ctrl.c
index 43484cc8386fbea3c9a01c4c37b0d7b89b767e96..4bca807b6956fad7750df9d3098d577c506e7cad 100644 (file)
--- a/udev/udev-ctrl.c
+++ b/udev/udev-ctrl.c
@@ -156,12 +156,17 @@ struct udev_ctrl *udev_ctrl_unref(struct udev_ctrl *uctrl)
                return uctrl;
        if (uctrl->sock >= 0)
                close(uctrl->sock);
                return uctrl;
        if (uctrl->sock >= 0)
                close(uctrl->sock);

-       if (uctrl->cleanup_socket)
-               unlink(uctrl->saddr.sun_path);

        free(uctrl);
        return NULL;
 }
 
        free(uctrl);
        return NULL;
 }
 

+int udev_ctrl_cleanup(struct udev_ctrl *uctrl)
+{
+       if (uctrl->cleanup_socket)
+               unlink(uctrl->saddr.sun_path);
+       return 0;
+}
+

 int udev_ctrl_get_fd(struct udev_ctrl *uctrl)
 {
        if (uctrl == NULL)
 int udev_ctrl_get_fd(struct udev_ctrl *uctrl)
 {
        if (uctrl == NULL)