amd.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. --- amq/amq.c.orig Fri Jan 12 23:52:00 2001
  2. +++ amq/amq.c Thu Jul 5 10:09:10 2001
  3. @@ -251,7 +251,9 @@
  4. mi->mi_up > 0 ? "up" :
  5. mi->mi_up < 0 ? "starting" : "down");
  6. if (mi->mi_error > 0) {
  7. +#if !defined(__FreeBSD__)
  8. extern int sys_nerr;
  9. +#endif
  10. if (mi->mi_error < sys_nerr)
  11. #ifdef HAVE_STRERROR
  12. printf(" (%s)", strerror(mi->mi_error));
  13. --- hlfsd/hlfsd.h.orig Fri Jan 12 23:52:03 2001
  14. +++ hlfsd/hlfsd.h Thu Jul 5 10:09:37 2001
  15. @@ -147,7 +147,9 @@
  16. extern int cache_interval;
  17. extern int noverify;
  18. extern int serverpid;
  19. +#if !defined(__FreeBSD__)
  20. extern int sys_nerr;
  21. +#endif
  22. extern int untab_index(char *username);
  23. extern am_nfs_fh *root_fhp;
  24. extern am_nfs_fh root;
  25. --- include/am_defs.h.orig Tue Feb 12 03:44:22 2002
  26. +++ include/am_defs.h Thu Sep 12 08:48:47 2002
  27. @@ -276,7 +276,7 @@
  28. /*
  29. * Actions to take if <malloc.h> exists.
  30. */
  31. -#ifdef HAVE_MALLOC_H
  32. +#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
  33. # include <malloc.h>
  34. #endif /* HAVE_MALLOC_H */
  35. --- hlfsd/stubs.c.orig Tue Feb 12 01:15:17 2002
  36. +++ hlfsd/stubs.c Thu Sep 12 09:51:03 2002
  37. @@ -133,7 +133,7 @@
  38. res.ns_u.ns_attr_u = rootfattr;
  39. } else if (eq_fh(argp, &slink)) {
  40. -#ifndef MNT2_NFS_OPT_SYMTTL
  41. +#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
  42. /*
  43. * This code is needed to defeat Solaris 2.4's (and newer) symlink
  44. * values cache. It forces the last-modified time of the symlink to be
  45. @@ -232,7 +232,7 @@
  46. }
  47. if (STREQ(argp->da_name, slinkname)) {
  48. -#ifndef MNT2_NFS_OPT_SYMTTL
  49. +#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
  50. /*
  51. * This code is needed to defeat Solaris 2.4's (and newer) symlink
  52. * values cache. It forces the last-modified time of the symlink to be