fixed compilation errors--but NQNFS may not work with new NFS code

diff --git a/usr.sbin/amd/amd/mount_fs.c b/usr.sbin/amd/amd/mount_fs.c
index fd6eab4..dd8661e 100644 (file)
--- a/usr.sbin/amd/amd/mount_fs.c
+++ b/usr.sbin/amd/amd/mount_fs.c
@@ -36,14 +36,13 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)mount_fs.c    8.1 (Berkeley) 6/6/93
- *     $Id: mount_fs.c,v 1.1.1.1 1995/10/18 08:47:11 deraadt Exp $
+ *     $Id: mount_fs.c,v 1.2 1996/04/03 14:13:05 dm Exp $
  */
 
 #include "am.h"
 #ifdef NFS_3
 typedef nfs_fh fhandle_t;
 #endif /* NFS_3 */
-#include <sys/mount.h>
 
 #include <sys/stat.h>
 

diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index ae7e78b..6510464 100644 (file)
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: nfs_ops.c,v 1.3 1996/03/25 15:54:48 niklas Exp $      */
+/*     $OpenBSD: nfs_ops.c,v 1.4 1996/04/03 14:13:06 dm Exp $  */
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nfs_ops.c  8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.3 1996/03/25 15:54:48 niklas Exp $";
+static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.4 1996/04/03 14:13:06 dm Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -635,8 +635,10 @@ mntfs *mf;
 #ifdef MNTOPT_NQNFS
        if (hasmntopt(&mnt, MNTOPT_NQNFS) != NULL)
                nfs_args.flags |= NFSMNT_NQNFS;
+#ifdef NFSMNT_NQLOOKLEASE
        if (hasmntopt(&mnt, "nolooklease") == NULL)
                nfs_args.flags |= NFSMNT_NQLOOKLEASE;
+#endif /* NFSMNT_NQLOOKLEASE */
 #endif /* MNTOPT_NQNFS */
 
 #ifdef NFSMNT_PGTHRESH