pkgsrc-wip/p3nfs/patches/patch-ac

45 lines
1.4 KiB
Text

$NetBSD: patch-ac,v 1.1 2005/01/02 21:29:03 mreriksson Exp $
--- nfsd/mp_mount.c.orig 2003-06-03 09:37:58.000000000 +0200
+++ nfsd/mp_mount.c
@@ -1,4 +1,4 @@
-#if defined(__SVR4) || defined(__sgi) || defined(linux)
+#if defined(__SVR4) || defined(__sgi) || defined(linux) || defined(__NetBSD__)
# include <stdlib.h>
# include <unistd.h>
# include <string.h> /* strdup */
@@ -23,6 +23,7 @@
#if defined(__NetBSD__) || defined(__FreeBSD__)
#include <sys/param.h> /* Needs NGROUPS for mount.h */
#define umount(dir) unmount(dir, 1)
+#include <nfs/nfsmount.h>
#endif
#if defined(__NeXT__)
@@ -154,7 +155,7 @@ doexit()
struct mntent *ent;
#endif
#endif
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
struct stat statb;
#endif
@@ -311,7 +312,7 @@ mount_and_run(dir, dev, proc, root_fh)
}
if (debug)
printf("created svc PROG=%d, VER=%d port=%d\n",
- NFS_PROGRAM, (int)NFS_VERSION, port);
+ (int)NFS_PROGRAM, (int)NFS_VERSION, port);
/*** Second part: mount the directory */
@@ -472,7 +473,7 @@ mount_and_run(dir, dev, proc, root_fh)
nfs_args.timeo = 600;
nfs_args.hostname = PSIONHOSTNAME;
nfs_args.flags = NFSMNT_INT | NFSMNT_RETRANS | NFSMNT_TIMEO
- | NFSMNT_NOCONN | NFSMNT_DUMBTIMR | NFSMNT_MYWRITE
+ | NFSMNT_NOCONN | NFSMNT_DUMBTIMR
| NFSMNT_WSIZE | NFSMNT_RSIZE ;
#endif