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

1 files changed, 3 insertions, 7 deletions

diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
index cf7ba33..73661c9 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.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.
  *
@@ -139,7 +135,7 @@ typedef writeargs nfswriteargs;
  */
 #if 0
 #define MOUNT_NFS3 MOUNT_NFS
-#endif
+#endif /* 0 */
 
 
 #endif /* not _AMU_NFS_PROT_H */