49 lines
1.8 KiB
Text
49 lines
1.8 KiB
Text
$NetBSD: patch-bn,v 1.1 2006/10/21 11:53:13 agc Exp $
|
|
|
|
--- ./sfsrwsd/filesrv.C.orig 2002-08-21 14:54:50.000000000 +0100
|
|
+++ ./sfsrwsd/filesrv.C
|
|
@@ -358,7 +358,7 @@ bool
|
|
filesrv::fixarg (svccb *sbp, reqstate *rqsp)
|
|
{
|
|
fh3trans fht (fh3trans::DECODE, fhkey);
|
|
- if (!nfs3_transarg (fht, sbp->template getarg<void> (), sbp->proc ())) {
|
|
+ if (!nfs3_transarg (fht, sbp->getarg<void> (), sbp->proc ())) {
|
|
nfs3exp_err (sbp, nfsstat3 (fht.err));
|
|
return false;
|
|
}
|
|
@@ -378,7 +378,7 @@ filesrv::fixarg (svccb *sbp, reqstate *r
|
|
* creating multiple mount points for each server. Is this bad? */
|
|
if (!sbp->getaui ()
|
|
&& !anon_checkperm (sbp, fsp->options,
|
|
- *sbp->template getarg<nfs_fh3> () == fsp->fh_root))
|
|
+ *sbp->getarg<nfs_fh3> () == fsp->fh_root))
|
|
return false;
|
|
#else
|
|
/* The other option is to disallow this. Then commands like "ls
|
|
@@ -386,7 +386,7 @@ filesrv::fixarg (svccb *sbp, reqstate *r
|
|
if (!sbp->getaui ()
|
|
&& !anon_checkperm (sbp, fsp->options,
|
|
(fsp == fstab.base ()
|
|
- && (*sbp->template getarg<nfs_fh3> ()
|
|
+ && (*sbp->getarg<nfs_fh3> ()
|
|
== fsp->fh_root))))
|
|
return false;
|
|
#endif
|
|
@@ -394,7 +394,7 @@ filesrv::fixarg (svccb *sbp, reqstate *r
|
|
switch (sbp->proc ()) {
|
|
case NFSPROC3_LOOKUP:
|
|
{
|
|
- diropargs3 *doa = sbp->template getarg<diropargs3> ();
|
|
+ diropargs3 *doa = sbp->getarg<diropargs3> ();
|
|
if (doa->name == ".." && doa->dir == fsp->fh_root) {
|
|
if (!getfsno (fsp)) {
|
|
nfs3exp_err (sbp, NFS3ERR_ACCES);
|
|
@@ -411,7 +411,7 @@ filesrv::fixarg (svccb *sbp, reqstate *r
|
|
case NFSPROC3_READDIR:
|
|
case NFSPROC3_READDIRPLUS:
|
|
{
|
|
- nfs_fh3 *rpa = sbp->template getarg<nfs_fh3> ();
|
|
+ nfs_fh3 *rpa = sbp->getarg<nfs_fh3> ();
|
|
if (*rpa == fsp->fh_root)
|
|
rqsp->rootfh = true;
|
|
break;
|