if (vendor && product) \
condlog(3, "%s: (%s:%s) %s %s", \
dev, vendor, product, (M), (S)); \
+ else if (wwid && !dev) \
+ condlog(3, "%s: %s %s", wwid, (M), (S)); \
else if (wwid) \
condlog(3, "%s: %s %s %s", dev, (M), wwid, (S)); \
else if (env) \
}
int
-filter_wwid (vector blist, vector elist, char * wwid)
+filter_wwid (vector blist, vector elist, char * wwid, char * dev)
{
int r = _filter_wwid(blist, elist, wwid);
- log_filter(NULL, NULL, NULL, wwid, NULL, r);
+ log_filter(dev, NULL, NULL, wwid, NULL, r);
return r;
}
int setup_default_blist (struct config *);
int alloc_ble_device (vector);
int filter_devnode (vector, vector, char *);
-int filter_wwid (vector, vector, char *);
+int filter_wwid (vector, vector, char *, char *);
int filter_device (vector, vector, char *, char *);
int filter_path (struct config *, struct path *);
int filter_property(struct config *, struct udev_device *);
check:
if (refwwid && strlen(refwwid)) {
if (filter_wwid(conf->blist_wwid, conf->elist_wwid,
- refwwid) > 0)
+ refwwid, NULL) > 0)
return 2;
}
}
if (mask & DI_BLACKLIST && mask & DI_WWID) {
if (!strlen(pp->wwid) ||
filter_wwid(conf->blist_wwid, conf->elist_wwid,
- pp->wwid) > 0) {
+ pp->wwid, pp->dev) > 0) {
return PATHINFO_SKIPPED;
}
}
param = convert_dev(param, 0);
condlog(2, "%s: add map (operator)", param);
- if (filter_wwid(conf->blist_wwid, conf->elist_wwid, param) > 0) {
+ if (filter_wwid(conf->blist_wwid, conf->elist_wwid, param, NULL) > 0) {
*reply = strdup("blacklisted\n");
*len = strlen(*reply) + 1;
condlog(2, "%s: map blacklisted", param);