diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 23:47:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 23:47:39 +0000 |
| commit | 882e83ccf31fca22178b290a6753a605bb52044c (patch) | |
| tree | e2e6ec6ef7e162fd03a03e5c71bc96ce90d1c105 /sbin/mount_nfs | |
| parent | 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 (diff) | |
sync to netbsd 960418
Diffstat (limited to 'sbin/mount_nfs')
| -rw-r--r-- | sbin/mount_nfs/Makefile | 4 | ||||
| -rw-r--r-- | sbin/mount_nfs/mount_nfs.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index ba0017f8e65..6c49ac859de 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1996/03/21 00:15:56 niklas Exp $ +# $OpenBSD: Makefile,v 1.4 1996/04/21 23:46:48 deraadt Exp $ # $NetBSD: Makefile,v 1.5 1996/02/18 11:59:09 fvdl Exp $ # @(#)Makefile 8.2 (Berkeley) 3/27/94 @@ -13,7 +13,7 @@ MAN= mount_nfs.8 #.PATH: ${MOUNT} CFLAGS+=-DNFS -.include <bsd.own.mk> # For KERBEROS +#.include <bsd.own.mk> # For KERBEROS .if defined(KERBEROS) CFLAGS+=-DNFSKERB diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 34fb23cb7b3..60694b9f81d 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -1,5 +1,5 @@ -/* $OpenBSD: mount_nfs.c,v 1.3 1996/03/21 00:16:03 niklas Exp $ */ -/* $NetBSD: mount_nfs.c,v 1.11 1996/02/18 11:59:11 fvdl Exp $ */ +/* $OpenBSD: mount_nfs.c,v 1.4 1996/04/21 23:46:50 deraadt Exp $ */ +/* $NetBSD: mount_nfs.c,v 1.12 1996/04/13 01:31:43 jtc Exp $ */ /* * Copyright (c) 1992, 1993, 1994 @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.11 1996/02/18 11:59:11 fvdl Exp $"; +static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.12 1996/04/13 01:31:43 jtc Exp $"; #endif #endif /* not lint */ @@ -107,7 +107,7 @@ static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.11 1996/02/18 11:59:11 fvdl Exp #define ALTF_SOFT 0x800 #define ALTF_TCP 0x1000 -struct mntopt mopts[] = { +const struct mntopt mopts[] = { MOPT_STDOPTS, MOPT_FORCE, MOPT_UPDATE, |