diff options
| author | cy <cy@FreeBSD.org> | 2016-12-23 22:42:14 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2016-12-23 22:42:14 +0000 |
| commit | 78047153f3f320f60a8264a8a33abb8636dbfc7c (patch) | |
| tree | 53c2e7da97b30a23be5e4d8f0bb2a8b5e5670e1c /contrib/amd/libamu/amu.h | |
| parent | bff6b519ae43ad35a81ea361a71b814e97a51c7c (diff) | |
| download | FreeBSD-src-78047153f3f320f60a8264a8a33abb8636dbfc7c.zip FreeBSD-src-78047153f3f320f60a8264a8a33abb8636dbfc7c.tar.gz | |
MFC r308493, r308619: Update amd from am-utils 6.1.5 to 6.2.
Used extensively on my network over the past ten weeks.
Reviewed by: pfg, brooks
Suggested by: pfg
Obtained from: ftp://ftp.am-utils.org/pub/am-utils/
Relnotes: yes
Differential Revision: D8405
Diffstat (limited to 'contrib/amd/libamu/amu.h')
| -rw-r--r-- | contrib/amd/libamu/amu.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/amd/libamu/amu.h b/contrib/amd/libamu/amu.h index 1e7834a..9415fc4 100644 --- a/contrib/amd/libamu/amu.h +++ b/contrib/amd/libamu/amu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2006 Erez Zadok + * Copyright (c) 1997-2014 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -16,11 +16,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgment: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -47,11 +43,14 @@ /* * Decide what maximum level of NFS server to try and mount with. */ -#ifdef HAVE_FS_NFS3 +#if defined(HAVE_FS_NFS4) +# define NFS_VERS_MAX NFS_VERSION4 +#elif defined(HAVE_FS_NFS3) # define NFS_VERS_MAX NFS_VERSION3 #else /* not HAVE_FS_NFS3 */ # define NFS_VERS_MAX NFS_VERSION #endif /* not HAVE_FS_NFS3 */ +# define NFS_VERS_MIN NFS_VERSION /* some systems like ncr2 do not define this in <rpcsvc/mount.h> */ #ifndef MNTPATHLEN |
