From 7fed830dc7cb588fd29bfb4473a751e970118652 Mon Sep 17 00:00:00 2001 From: dm Date: Wed, 3 Apr 1996 14:13:05 +0000 Subject: [PATCH] fixed compilation errors--but NQNFS may not work with new NFS code --- usr.sbin/amd/amd/mount_fs.c | 3 +-- usr.sbin/amd/amd/nfs_ops.c | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/amd/amd/mount_fs.c b/usr.sbin/amd/amd/mount_fs.c index fd6eab45ff2..dd8661e99a0 100644 --- 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 #include diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c index ae7e78b5530..6510464b4ff 100644 --- 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 -- 2.20.1