release 172

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 4c51ed58e58ff33fb9cad7b02e2aca43966ea979..832abbbfce097007e8e2116054b562d5b5b58e58 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -43,7 +43,6 @@ struct udev_event *udev_event_new(struct udev_device *dev)
        event = calloc(1, sizeof(struct udev_event));
        if (event == NULL)
                return NULL;
-       event->mode = 0600;
        event->dev = dev;
        event->udev = udev_device_get_udev(dev);
        udev_list_init(&event->run_list);
@@ -1021,9 +1020,18 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                        if (event->dev_db != NULL)
                                udev_node_update_old_links(dev, event->dev_db);
 
-                       /* change default 0600 to 0660 if a group is assigned */
-                       if (event->mode == 0600 && event->gid > 0)
-                               event->mode = 0660;
+                       if (!event->mode_set) {
+                               if (udev_device_get_devnode_mode(dev) > 0) {
+                                       /* kernel supplied value */
+                                       event->mode = udev_device_get_devnode_mode(dev);
+                               } else if (event->gid > 0) {
+                                       /* default 0660 if a group is assigned */
+                                       event->mode = 0660;
+                               } else {
+                                       /* default 0600 */
+                                       event->mode = 0600;
+                               }
+                       }
 
                        err = udev_node_add(dev, event->mode, event->uid, event->gid);
                }