diff options
author | Maxim Mikityanskiy <maxtram95@gmail.com> | 2015-08-22 11:33:32 +0300 |
---|---|---|
committer | Maxim Mikityanskiy <maxtram95@gmail.com> | 2015-08-22 11:33:32 +0300 |
commit | 9a9c7dc2cbbe3c26cfbbcb02475d95ff3afe507e (patch) | |
tree | 1622a1b04c72731acab4714c9cd12c51b7f67e39 /src/resolve/resolved-dns-scope.c | |
parent | ef7051360aefca01d20f700ee74ac1baced59879 (diff) |
sd-device: fix enumeration of devices without subsystem
Prior to commit c32eb440bab953a0169cd207dfef5cad16dfb340, libudev's
function udev_enumerate_scan_devices() had behaved differently. If
parent match was added with udev_enumerate_add_match_parent(),
udev_enumerate_scan_devices() did not return error if some child devices
had no subsystem symlink in sysfs. An example of such devices is USB
endpoints /sys/bus/usb/devices/*/ep_*. If there was a parent match
against USB device, old implementation of udev_enumerate_scan_devices()
did not treat ep_* device directories without subsystem symlink as error
and just ignored them, but new implementation returns -ENOENT (also
ignoring these devices) though correctly enumerates all other matching
devices.
To compare, you could look at 96df036fe3d25525a44f5efdb2fc8560e82e6cfd,
in src/libudev/libudev-enumerate.c, function parent_add_child():
if (!match_subsystem(enumerate, udev_device_get_subsystem(dev)))
goto nomatch;
udev_device_get_subsystem() was returning NULL, match_subsystem() was
returning false, and USB endpoint device was ignored.
New parent_add_child() from src/libsystemd/sd-device/device-enumerator.c
checks return value of sd_device_get_subsystem() and fails if subsystem
was not found. Absence of subsystem symlink should not be really treated
as error because all enumerations of children of USB devices will fail
with -ENOENT. This new behavior also breaks system-config-printer.
So restore old behavior and treat absence of subsystem symlink as no
match.
Diffstat (limited to 'src/resolve/resolved-dns-scope.c')
0 files changed, 0 insertions, 0 deletions