summaryrefslogtreecommitdiffstats
path: root/usr.sbin/amd
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1995-06-27 11:07:30 +0000
committerdfr <dfr@FreeBSD.org>1995-06-27 11:07:30 +0000
commit666343f7f055c064375d48bb9a608730d7145beb (patch)
tree372bad41f8c547f40d0826ed596c53dc772ab986 /usr.sbin/amd
parent6da3ef32238f37b3b45cf709205fcff60bcbda7f (diff)
downloadFreeBSD-src-666343f7f055c064375d48bb9a608730d7145beb.zip
FreeBSD-src-666343f7f055c064375d48bb9a608730d7145beb.tar.gz
Changes to support version 3 of the NFS protocol.
The version 2 support has been tested (client+server) against FreeBSD-2.0, IRIX 5.3 and FreeBSD-current (using a loopback mount). The version 2 support is stable AFAIK. The version 3 support has been tested with a loopback mount and minimally against an IRIX 5.3 server. It needs more testing and may have problems. I have patched amd to support the new variable length filehandles although it will still only use version 2 of the protocol. Before booting a kernel with these changes, nfs clients will need to at least build and install /usr/sbin/mount_nfs. Servers will need to build and install /usr/sbin/mountd. NFS diskless support is untested. Obtained from: Rick Macklem <rick@snowhite.cis.uoguelph.ca>
Diffstat (limited to 'usr.sbin/amd')
-rw-r--r--usr.sbin/amd/amd/afs_ops.c5
-rw-r--r--usr.sbin/amd/amd/nfs_ops.c5
-rw-r--r--usr.sbin/amd/config/os-bsd44.h7
3 files changed, 14 insertions, 3 deletions
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index 73f39a8..d10a262 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -37,7 +37,7 @@
*
* @(#)afs_ops.c 8.1 (Berkeley) 6/6/93
*
- * $Id: afs_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $
+ * $Id: afs_ops.c,v 1.2 1995/05/30 03:45:43 rgrimes Exp $
*
*/
@@ -144,6 +144,9 @@ char *opts;
}
NFS_FH_DREF(nfs_args.fh, (NFS_FH_TYPE) fhp);
+#ifdef NFSv3
+ nfs_args.fhsize = FHSIZE;
+#endif
/*
* Create sockaddr to point to the local machine. 127.0.0.1
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index 1d92974..eed5b71 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nfs_ops.c,v 1.2 1995/02/13 01:56:22 wpaul Exp $
+ * $Id: nfs_ops.c,v 1.3 1995/05/30 03:45:52 rgrimes Exp $
*/
#ifndef lint
@@ -529,6 +529,9 @@ mntfs *mf;
* set mount args
*/
NFS_FH_DREF(nfs_args.fh, (NFS_FH_TYPE) fhp->fhstatus_u.fhs_fhandle);
+#ifdef NFSv3
+ nfs_args.fhsize = FHSIZE;
+#endif
#ifdef ULTRIX_HACK
nfs_args.optstr = mnt.mnt_opts;
diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h
index fa41cfe..863ebfa 100644
--- a/usr.sbin/amd/config/os-bsd44.h
+++ b/usr.sbin/amd/config/os-bsd44.h
@@ -37,7 +37,7 @@
*
* @(#)os-bsd44.h 8.1 (Berkeley) 6/6/93
*
- * $Id: os-bsd44.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $
+ * $Id: os-bsd44.h,v 1.2 1995/01/20 20:58:54 wollman Exp $
*
* 4.4 BSD definitions for Amd (automounter)
*/
@@ -61,6 +61,7 @@
*/
#define NFS_44
#define HAS_TCP_NFS
+#define NFSv3
/*
* Does this OS have NDBM support?
@@ -170,7 +171,11 @@ struct mntent {
* Type of a file handle
*/
#undef NFS_FH_TYPE
+#ifdef NFSv3
+#define NFS_FH_TYPE fhandle_t *
+#else
#define NFS_FH_TYPE nfsv2fh_t *
+#endif
/*
* How to get a mount list
OpenPOWER on IntegriCloud