← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libfprint/saucy-proposed

« back to all changes in this revision

Viewing changes to libfprint/fprint-list-udev-rules.c

  • Committer: Package Import Robot
  • Author(s): Didier Raboud
  • Date: 2012-06-26 10:52:16 UTC
  • mfrom: (2.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120626105216-f4pzq3iid2tq4a24
Tags: 1:0.4.0-4-gdfff16f-3
http://bugs.debian.org/679001
* Patch the udev rules creator to:
  - include all devices; (Closes: #679001)
  - handle blacklists correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfprint/fprint-list-udev-rules.c
49
49
        blacklist = 0;
50
50
        for (j = 0; blacklist_id_table[j].vendor != 0; j++) {
51
51
            if (driver->id_table[i].vendor == blacklist_id_table[j].vendor &&
52
 
                driver->id_table[j].product == blacklist_id_table[j].product) {
 
52
                driver->id_table[i].product == blacklist_id_table[j].product) {
53
53
                blacklist = 1;
54
54
                break;
55
55
            }
56
56
        }
57
 
        if (blacklist)
58
 
            continue;
59
 
 
60
57
        key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product);
61
58
 
62
59
        if (g_hash_table_lookup (printed, key) != NULL) {
66
63
 
67
64
        g_hash_table_insert (printed, key, GINT_TO_POINTER (1));
68
65
 
69
 
        printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
 
66
        printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ", driver->id_table[i].vendor, driver->id_table[i].product);
 
67
        if (!blacklist)
 
68
                printf ("ATTR{power/control}=\"auto\", ");
 
69
        printf ("MODE=\"0664\", GROUP=\"plugdev\"\n");
70
70
    }
71
71
}
72
72