patch-src_mount_davfs_c 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. --- davfs2-1.4.6.orig/src/mount_davfs.c 2010-01-21 19:50:15.000000000 +0100
  2. +++ davfs2-1.4.6/src/mount_davfs.c 2010-05-29 21:10:23.041613426 +0200
  3. @@ -29,7 +29,6 @@
  4. #ifdef HAVE_FCNTL_H
  5. #include <fcntl.h>
  6. #endif
  7. -#include <fstab.h>
  8. #include <getopt.h>
  9. #include <grp.h>
  10. #ifdef HAVE_LIBINTL_H
  11. @@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
  12. static void
  13. check_fstab(const dav_args *args)
  14. {
  15. +#if 0
  16. dav_args *n_args = new_args();
  17. n_args->mopts = DAV_USER_MOPTS;
  18. @@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
  19. endfsent();
  20. delete_args(n_args);
  21. +#endif
  22. }
  23. @@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
  24. struct passwd *pw;
  25. if (*mpoint != '/') {
  26. - char *mp = canonicalize_file_name(mpoint);
  27. + char *mp = realpath(mpoint, NULL);
  28. if (!mp)
  29. error(EXIT_FAILURE, 0,
  30. _("can't evaluate path of mount point %s"), mpoint);
  31. @@ -1824,6 +1825,7 @@ new_args(void)
  32. static void
  33. log_dbg_cmdline(char *argv[])
  34. {
  35. + /*
  36. size_t len;
  37. char *cmdline;
  38. if (argz_create(argv, &cmdline, &len) == 0) {
  39. @@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
  40. syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
  41. free(cmdline);
  42. }
  43. + */
  44. }