You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
99 lines
3.1 KiB
99 lines
3.1 KiB
Index: amd/amfs_toplvl.c |
|
--- amd/amfs_toplvl.c.orig 2014-10-28 18:12:59.000000000 +0100 |
|
+++ amd/amfs_toplvl.c 2015-01-16 23:45:03.397244750 +0100 |
|
@@ -228,6 +228,10 @@ |
|
xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts)); |
|
#endif /* MNTTAB_OPT_NOLOCK */ |
|
|
|
+#ifdef MNTTAB_OPT_NOLOCK |
|
+ xstrlcat(opts, ",", sizeof(opts)); |
|
+ xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts)); |
|
+#endif /* MNTTAB_OPT_NOLOCK */ |
|
#ifdef MNTTAB_OPT_NOAC |
|
if (gopt.auto_attrcache == 0) { |
|
xstrlcat(opts, ",", sizeof(opts)); |
|
Index: amd/conf_tok.l |
|
--- amd/conf_tok.l.orig 2014-10-28 18:12:59.000000000 +0100 |
|
+++ amd/conf_tok.l 2015-01-16 23:45:03.397244750 +0100 |
|
@@ -106,9 +106,6 @@ |
|
%option nounput |
|
%option noinput |
|
|
|
-/* allocate more output slots so lex scanners don't run out of mem */ |
|
-%o 1024 |
|
- |
|
DIGIT [0-9] |
|
ALPHA [A-Za-z] |
|
ALPHANUM [A-Za-z0-9] |
|
Index: conf/nfs_prot/nfs_prot_freebsd3.h |
|
--- conf/nfs_prot/nfs_prot_freebsd3.h.orig 2014-10-28 18:12:59.000000000 +0100 |
|
+++ conf/nfs_prot/nfs_prot_freebsd3.h 2015-01-16 23:57:49.805688630 +0100 |
|
@@ -85,9 +85,11 @@ |
|
#define na_ctime ctime |
|
#define na_fileid fileid |
|
#define na_fsid fsid |
|
+#define na_gid gid |
|
#define na_mode mode |
|
#define na_mtime mtime |
|
#define na_nlink nlink |
|
+#define na_rdev rdev |
|
#define na_size size |
|
#define na_type type |
|
#define na_uid uid |
|
Index: config.h.in |
|
--- config.h.in.orig 2014-10-30 15:38:46.000000000 +0100 |
|
+++ config.h.in 2015-01-16 23:45:03.405632408 +0100 |
|
@@ -165,6 +165,9 @@ |
|
/* Define to 1 if you have the <db1/ndbm.h> header file. */ |
|
#undef HAVE_DB1_NDBM_H |
|
|
|
+/* Define to 1 if you have the <gdbm/ndbm.h> header file. */ |
|
+#undef HAVE_GDBM_NDBM_H |
|
+ |
|
/* Define to 1 if you have the `dbm_open' function. */ |
|
#undef HAVE_DBM_OPEN |
|
|
|
@@ -772,6 +775,9 @@ |
|
/* Define to 1 if you have the <nfs/nfs.h> header file. */ |
|
#undef HAVE_NFS_NFS_H |
|
|
|
+/* Define if you have the <nfsclient/nfs.h> header file. */ |
|
+#undef HAVE_NFSCLIENT_NFS_H |
|
+ |
|
/* Define to 1 if you have the <nfs/nfs_mount.h> header file. */ |
|
#undef HAVE_NFS_NFS_MOUNT_H |
|
|
|
Index: fsinfo/fsi_lex.l |
|
--- fsinfo/fsi_lex.l.orig 2014-10-28 18:13:00.000000000 +0100 |
|
+++ fsinfo/fsi_lex.l 2015-01-16 23:45:03.426239287 +0100 |
|
@@ -162,9 +162,6 @@ |
|
%option nounput |
|
%option noinput |
|
|
|
-/* allocate more output slots so lex scanners don't run out of mem */ |
|
-%o 1024 |
|
- |
|
%start F Q |
|
|
|
%% |
|
Index: hlfsd/stubs.c |
|
--- hlfsd/stubs.c.orig 2014-10-28 18:13:00.000000000 +0100 |
|
+++ hlfsd/stubs.c 2015-01-16 23:45:03.436506723 +0100 |
|
@@ -138,7 +138,7 @@ |
|
res.ns_u.ns_attr_u = rootfattr; |
|
} else if (eq_fh(argp, &slink)) { |
|
|
|
-#ifndef MNT2_NFS_OPT_SYMTTL |
|
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) |
|
/* |
|
* This code is needed to defeat Solaris 2.4's (and newer) symlink |
|
* values cache. It forces the last-modified time of the symlink to be |
|
@@ -244,7 +244,7 @@ |
|
} |
|
|
|
if (STREQ(argp->da_name, slinkname)) { |
|
-#ifndef MNT2_NFS_OPT_SYMTTL |
|
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) |
|
/* |
|
* This code is needed to defeat Solaris 2.4's (and newer) symlink |
|
* values cache. It forces the last-modified time of the symlink to be
|
|
|