patch-src_linux_device_c 841 B

123456789101112131415161718192021
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- tinc-1.0.9.orig/src/linux/device.c 2006-12-16 17:54:05.000000000 +0100
  3. +++ tinc-1.0.9/src/linux/device.c 2009-05-11 23:55:39.000000000 +0200
  4. @@ -64,7 +64,7 @@ bool setup_device(void)
  5. #ifdef HAVE_LINUX_IF_TUN_H
  6. iface = netname;
  7. #else
  8. - iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
  9. + iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device;
  10. #endif
  11. device_fd = open(device, O_RDWR | O_NONBLOCK);
  12. @@ -104,7 +104,7 @@ bool setup_device(void)
  13. overwrite_mac = true;
  14. device_info = _("Linux ethertap device");
  15. device_type = DEVICE_TYPE_ETHERTAP;
  16. - iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
  17. + iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device;
  18. }
  19. logger(LOG_INFO, _("%s is a %s"), device, device_info);