chiark / gitweb /
loginctl: don't show [UACCESS] info in device tree
authorLennart Poettering <lennart@poettering.net>
Fri, 25 Jan 2013 03:48:34 +0000 (04:48 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 25 Jan 2013 03:48:34 +0000 (04:48 +0100)
As the tree doesn't really necessarily show all device node devices and
only those are marked for uaccess it's kinda pointless showing this at
all, since it would give a pretty incomplete impression of the uaccess
information.

src/login/sysfs-show.c

index da34c3ade84acac215aae9f9cb5c6024b70be6b3..fc3af75876ba512c81f4bc9f6590079859f105a7 100644 (file)
@@ -45,7 +45,7 @@ static int show_sysfs_one(
                 struct udev_device *d;
                 const char *sn, *name, *sysfs, *subsystem, *sysname;
                 char *l, *k;
                 struct udev_device *d;
                 const char *sn, *name, *sysfs, *subsystem, *sysname;
                 char *l, *k;
-                bool is_master, uaccess;
+                bool is_master;
 
                 sysfs = udev_list_entry_get_name(*item);
                 if (!path_startswith(sysfs, sub))
 
                 sysfs = udev_list_entry_get_name(*item);
                 if (!path_startswith(sysfs, sub))
@@ -69,7 +69,6 @@ static int show_sysfs_one(
                 }
 
                 is_master = udev_device_has_tag(d, "seat-master");
                 }
 
                 is_master = udev_device_has_tag(d, "seat-master");
-                uaccess = udev_device_has_tag(d, "uaccess");
 
                 name = udev_device_get_sysattr_value(d, "name");
                 if (!name)
 
                 name = udev_device_get_sysattr_value(d, "name");
                 if (!name)
@@ -114,8 +113,8 @@ static int show_sysfs_one(
                 free(k);
 
                 if (asprintf(&l,
                 free(k);
 
                 if (asprintf(&l,
-                             "%s%s%s:%s%s%s%s",
-                             is_master ? "[MASTER] " : "", uaccess ? "[ACL] " : "",
+                             "%s%s:%s%s%s%s",
+                             is_master ? "[MASTER] " : "",
                              subsystem, sysname,
                              name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
                         udev_device_unref(d);
                              subsystem, sysname,
                              name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
                         udev_device_unref(d);