This fixes building on OpenBSD and properly adds ykcore_libusb output to gitignore.

diff --git a/.gitignore b/.gitignore
index 49d8a6e5fd4119422ca12a41907f9bb19ed7ed8b..5e6aaaa4be02e40caa1bd1445555f04853d3a928 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,8 @@ ykcore/ykcore.lo
 ykcore/ykcore.o
 ykcore/ykcore_libusb-1.0.lo
 ykcore/ykcore_libusb-1.0.o
+ykcore/ykcore_libusb.lo
+ykcore/ykcore_libusb.o
 ykcore/ykstatus.lo
 ykcore/ykstatus.o
 ykpbkdf2.lo

diff --git a/ykcore/ykcore_libusb.c b/ykcore/ykcore_libusb.c
index 287b5acdad4b9a3ac1da447e9c845c1fbf6a9a46..73cf583d70b4e4c642efb19a09e020f8dcac9feb 100644 (file)
--- a/ykcore/ykcore_libusb.c
+++ b/ykcore/ykcore_libusb.c
@@ -159,8 +159,10 @@ void *_ykusb_open_device(int vendor_id, int product_id)
                            && dev->descriptor.idProduct == YUBIKEY_PID) {
                                rc = YK_EUSBERR;
                                h = usb_open(dev);
+#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
                                if (h != NULL)
                                        usb_detach_kernel_driver_np(h, 0);
+#endif
                                goto done;
                        }
        }