1
0

patch-src_mount_davfs_c 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. --- davfs2-1.4.7.orig/src/mount_davfs.c 2012-07-19 13:35:11.000000000 +0200
  2. +++ davfs2-1.4.7/src/mount_davfs.c 2014-01-01 20:14:21.000000000 +0100
  3. @@ -20,16 +20,15 @@
  4. #include "config.h"
  5. +#include <paths.h>
  6. #ifdef HAVE_ARGZ_H
  7. #include <argz.h>
  8. #endif
  9. #include <ctype.h>
  10. #include <errno.h>
  11. -#include <error.h>
  12. #ifdef HAVE_FCNTL_H
  13. #include <fcntl.h>
  14. #endif
  15. -#include <fstab.h>
  16. #include <getopt.h>
  17. #include <grp.h>
  18. #ifdef HAVE_LIBINTL_H
  19. @@ -674,6 +673,7 @@ check_double_mounts(dav_args *args)
  20. static void
  21. check_fstab(const dav_args *args)
  22. {
  23. +#if 0
  24. dav_args *n_args = new_args();
  25. n_args->mopts = DAV_USER_MOPTS;
  26. setfsent();
  27. @@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
  28. endfsent();
  29. delete_args(n_args);
  30. +#endif
  31. }
  32. @@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
  33. struct passwd *pw;
  34. if (*mpoint != '/') {
  35. - char *mp = canonicalize_file_name(mpoint);
  36. + char *mp = realpath(mpoint, NULL);
  37. if (!mp)
  38. error(EXIT_FAILURE, 0,
  39. _("can't evaluate path of mount point %s"), mpoint);
  40. @@ -1793,6 +1794,7 @@ new_args(void)
  41. static void
  42. log_dbg_cmdline(char *argv[])
  43. {
  44. + /*
  45. size_t len;
  46. char *cmdline;
  47. if (argz_create(argv, &cmdline, &len) == 0) {
  48. @@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[])
  49. syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline);
  50. free(cmdline);
  51. }
  52. + */
  53. }