diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 2000-07-03 09:14:17 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 2000-07-03 09:14:17 +0000 |
| commit | 1da65dd7d05478abc1a90a5da80ffa880772f803 (patch) | |
| tree | 84bb09ecefaa6bcd737f1daefd4b18e0677be7a9 /usr.sbin/usbd | |
| parent | 792b0bd86d6da457e14bfce0a7659667267e081f (diff) | |
Notes
Diffstat (limited to 'usr.sbin/usbd')
| -rw-r--r-- | usr.sbin/usbd/usbd.c | 7 | ||||
| -rw-r--r-- | usr.sbin/usbd/usbd.conf.5 | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c index b866eca63ed6..06e7637bf853 100644 --- a/usr.sbin/usbd/usbd.c +++ b/usr.sbin/usbd/usbd.c @@ -702,7 +702,12 @@ find_action(struct usb_device_info *devinfo, action_match_t *action_match) (action->devname == WILDCARD_STRING || (match = match_devname(action, devinfo)) != -1)) { /* found match !*/ - if (match != -1) + + /* Find a devname for pretty printing. Either + * the matched one or otherwise, if there is only + * one devname for that device, use that. + */ + if (match >= 0) devname = devinfo->devnames[match]; else if (devinfo->devnames[0][0] != '\0' && devinfo->devnames[1][0] == '\0') diff --git a/usr.sbin/usbd/usbd.conf.5 b/usr.sbin/usbd/usbd.conf.5 index 1d92d2798084..51328354261b 100644 --- a/usr.sbin/usbd/usbd.conf.5 +++ b/usr.sbin/usbd/usbd.conf.5 @@ -154,6 +154,9 @@ configuration file. .Xr usb 4 , .Xr usbd 8 , .Xr usbdevs 8 +.Sh BUGS +It is currently not possible to use a selection criterium more than once. For +example it is not possible to specify more than one vendor Id. .Sh AUTHORS The man page for the usbd configuration file was written by .An Nick Hibma Aq n_hibma@freebsd.org . |