MAKE_ARGS=	KMODDIR=${KMODDIR}

MODULE_PATH=	`/sbin/sysctl -n kern.module_path`;${KMODDIR}

USE_RC_SUBR=	fusefs

--- fuse_module/fuse_io.c.orig	Tue Jun 19 09:35:22 2007

+++ fuse_module/fuse_io.c	Thu Dec 13 02:46:05 2007

@@ -148,7 +148,7 @@

 	}

 	if (uio->uio_resid == 0)

-		return (0);

+		goto out;

 	if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {

 		if ((err = VOP_GETATTR(vp, &va, cred, td)))

--- fuse_module/Makefile.orig	2007-06-19 14:35:22.000000000 +0200

+++ fuse_module/Makefile	2007-08-16 18:31:50.000000000 +0200

@@ -21,7 +21,14 @@

 .endif

 .if defined(KERNCONF)

-KERNCONFDIR= /usr/obj/usr/src/sys/${KERNCONF}

+.if !defined(MAKEOBJDIRPREFIX)

+MAKEOBJDIRPREFIX=/usr/obj

+.endif

+.if !defined(SRC_BASE)

+SRC_BASE=/usr/src

+.endif

+KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g'

+KERNCONFDIR= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF1}

 .endif

 .if defined(KERNCONFDIR)

--- fuse_module/fuse.h.orig	Tue Jun 19 14:35:22 2007

+++ fuse_module/fuse.h	Sat Jul 14 13:23:37 2007

@@ -33,6 +33,24 @@

 #endif

 #endif

+#ifndef USE_PRIVILEGE_API

+/*

+ * __FreeBSD_version bump was omitted for introduction of

+ * the privilege API (both when it's been added and when the

+ * legacy API has been removed), so here we just use the first

+ * value of __FreeBSD_version after adding the priv stuff.

+ */

+#if __FreeBSD_version >= 700025

+#define USE_PRIVILEGE_API 1

+#else

+#define USE_PRIVILEGE_API 0

+#endif

+#endif

+#if ! USE_PRIVILEGE_API

+#define priv_check(td, priv) suser(td)

+#define priv_check_cred(cred, priv, flag) suser_cred(cred, SUSER_ALLOWJAIL)

+#endif

+

 /*

  * Appearance of new FUSE operations is not always in par with version

  * numbering... At least, 7.3 is a sufficient condition for having

@@ -210,7 +228,7 @@

 void fprettyprint(struct fuse_iov *fiov, size_t dlen);

 #endif

-#if _DEBUG || _DEBUG2G || _DEBUG3G || defined(INVARIANTS)

+#if _DEBUG || _DEBUG2G || _DEBUG3G || defined(INVARIANTS) || FUSELIB_CONFORM_BIOREAD

 int isbzero(void *buf, size_t len);

 #endif

--- fuse_module/fuse_vfsops.c	Sat Jul 14 13:13:55 2007

+++ fuse_module/fuse_vfsops.c	Sat Jul 14 13:13:55 2007

@@ -23,6 +23,20 @@

 #include "fuse_session.h"

 #include "fuse_vnode.h"

+#if USE_PRIVILEGE_API

+#include <sys/priv.h>

+#endif

+

+

+/* This will do for privilege types for now */

+#ifndef PRIV_VFS_FUSE_ALLOWOTHER

+#define PRIV_VFS_FUSE_ALLOWOTHER PRIV_VFS_MOUNT_NONUSER

+#endif

+#ifndef PRIV_VFS_FUSE_MOUNT_NONUSER

+#define PRIV_VFS_FUSE_MOUNT_NONUSER PRIV_VFS_MOUNT_NONUSER

+#endif

+

+

 static int fuse_init_handler(struct fuse_ticket *tick, struct uio *uio);

 static void fuse_send_init(struct fuse_data *data, struct thread *td);

 static vfs_hash_cmp_t fuse_vnode_bgdrop_cmp;

@@ -207,10 +221,8 @@ fuse_mount(struct mount *mp, struct thre

 	KASSERT(fuse_useco >= 0,

 	        ("negative fuse usecount despite Giant"));

-	if (mp->mnt_flag & MNT_UPDATE) {

-		uprintf("fuse: updating mounts is not supported\n");

+	if (mp->mnt_flag & MNT_UPDATE)

 		return (EOPNOTSUPP);

-	}

 	mp->mnt_flag |= MNT_SYNCHRONOUS; 

 	/* Get the new options passed to mount */

@@ -293,10 +305,8 @@ fuse_mount(struct mount *mp, struct thre

 	if (fdata_kick_get(data))

 		err = ENOTCONN;

-	if (mntopts & FSESS_DAEMON_CAN_SPY && suser(td)) {

-		uprintf("only root can use \"allow_other\"\n");

-		err = EPERM;

-	}

+	if (mntopts & FSESS_DAEMON_CAN_SPY)

+	    err = priv_check(td, PRIV_VFS_FUSE_ALLOWOTHER);

 	slock = &data->mhierlock;

 	/* Note that sx_try_xlock returns 0 on _failure_ */

@@ -334,10 +344,9 @@ fuse_mount(struct mount *mp, struct thre

 			 */

 			err = EINVAL;

 	} else {

-		if (suser(td) &&

-	            td->td_ucred->cr_uid != data->daemoncred->cr_uid)

-			/* we are not allowed to do the first mount */

-			err = EPERM;

+		if (td->td_ucred->cr_uid != data->daemoncred->cr_uid)

+			/* are we allowed to do the first mount? */

+			err = priv_check(td, PRIV_VFS_FUSE_MOUNT_NONUSER);

 	}

 	if (err) {

--- fuse_module/fuse_vnops.c	Sat Jul 14 13:14:27 2007

+++ fuse_module/fuse_vnops.c	Sat Jul 14 13:14:27 2007

@@ -42,6 +42,10 @@

 #include "fuse_vnode.h"

 #include "fuse_io.h"

+#if USE_PRIVILEGE_API

+#include <sys/priv.h>

+#endif

+

 /* function prototype for iterators over filehandles (of a vp) */

 typedef int fuse_metrics_t(struct vnode *vp, struct thread *td,

                            struct ucred *cred, struct fuse_filehandle *fufh,

@@ -63,7 +67,9 @@ struct fuse_access_param {

 #define FACCESS_CHOWN      0x08 /* do permission check for owner changing */

 #define FACCESS_NOCHECKSPY 0x10 /* don't check if daemon is allowed to spy on

                                    user */

-#define FACCESS_XQUERIES FACCESS_STICKY | FACCESS_CHOWN

+#define FACCESS_SETGID     0x12 /* do permission check for setting setgid flag */

+

+#define FACCESS_XQUERIES FACCESS_STICKY | FACCESS_CHOWN | FACCESS_SETGID

 #define FVP_ACCESS_NOOP   0x01 /* vnode based control flag for doing access check */

@@ -855,6 +861,7 @@ fuse_access(ap)

 /*

  * Attribute caching hasn't yet been implemented.

+ * [... Update: it _has been_ implemented.]

  * However, within one function we don't wanna query attributes

  * several times. Now it's enough pull the attributes once, and throw

  * it into the following routine with various modes.

@@ -929,12 +936,16 @@ fuse_access_i(struct vnode *vp, mode_t m

 			    mode == VWRITE) {

 				if (cred->cr_uid != facp->xuid &&

 				    cred->cr_uid != VTOVA(vp)->va_uid)

-					    err = suser_cred(cred, SUSER_ALLOWJAIL);

+	    				err = priv_check_cred(cred,

+					                      PRIV_VFS_ADMIN,

+					                      0);

 			}

 			/*

 			 * We return here because this flags is exlusive

 			 * with the others

 			 */

+			KASSERT(facp->facc_flags == FACCESS_STICKY,

+			        ("sticky access check comes in mixed"));

 			return (err);

 		}

@@ -947,10 +958,21 @@ fuse_access_i(struct vnode *vp, mode_t m

 			    (cred->cr_gid != facp->xgid &&

 			         facp->xgid != (gid_t)VNOVAL &&

 			         ! groupmember(facp->xgid, cred)))

-				err = suser_cred(cred, SUSER_ALLOWJAIL);

-			return (err);

+				err = priv_check_cred(cred, PRIV_VFS_CHOWN, 0);

+			if (err)

+				return (err);

 		}

+		if (facp->facc_flags & FACCESS_SETGID) {

+			gid_t sgid = facp->xgid;

+

+			if (sgid == (gid_t)VNOVAL)

+				sgid = VTOVA(vp)->va_gid;

+

+			if (! groupmember(sgid, cred))

+				err = priv_check_cred(cred, PRIV_VFS_SETGID, 0);

+			return (err);

+		}

 	} else {

 #if FUSE_HAS_ACCESS

@@ -1234,7 +1256,13 @@ fuse_lookup(ap)

 		 */

 		if (nameiop == RENAME && wantparent && islastcn) {

 			DEBUG("something to rename...\n");

-			if ((err = fuse_access_i(dvp, VWRITE, cred, td, &facp)))

+

+			facp.xuid = fattr->uid;

+			facp.facc_flags |= FACCESS_STICKY;

+			err = fuse_access_i(dvp, VWRITE, cred, td, &facp);

+			facp.facc_flags &= ~FACCESS_XQUERIES;

+

+			if (err)

 				goto out;

 			/*

@@ -2948,8 +2976,14 @@ fuse_setattr(ap)

 	}

 	if (vap->va_mode != (mode_t)VNOVAL) {

+#if _DEBUG

 		if (vap->va_mode & S_IFMT)

-			DEBUG("fuse_setattr -- weird: format bits in mode field, 0%o\n", vap->va_mode);

+			DEBUG("fuse_setattr -- weird: "

+			      "format bits in mode field, 0%o\n",

+			      vap->va_mode);

+#endif

+		if (vap->va_mode & S_ISGID)

+			facp.facc_flags |= FACCESS_SETGID;

 		fsai->FUSEATTR(mode) = vap->va_mode & ALLPERMS;

 		fsai->valid |= FATTR_MODE;

 	}

--- mount_fusefs/mount_fusefs.c.orig	Tue Jun 19 09:35:22 2007

+++ mount_fusefs/mount_fusefs.c	Thu Dec 13 02:44:12 2007

@@ -70,6 +70,8 @@

 	{ "user_id=",            0, 0x00, 1 },

 	{ "group_id=",           0, 0x00, 1 },

 	{ "large_read",          0, 0x00, 1 },

+	/* "nonempty", just the first two chars are stripped off during parsing */

+	{ "nempty",              0, 0x00, 1 },

 	MOPT_STDOPTS,

 	MOPT_END

 };

@@ -469,7 +471,8 @@

 int

 init_backgrounded(void)

 {

-	int ibg, len;

+	int ibg;

+	size_t len;

 	len = sizeof(ibg);

#!/bin/sh

#

# Automatically setup the loading of the module without polluting /boot/modules

SYSCTL_CONFIG=/etc/sysctl.conf

LOADER_CONFIG=/etc/rc.conf

sysctl kern.module_path | grep "[:space:;=]@@PREFIX@@/modules[;]\?\b" > /dev/null 2>&1; RESULT=$?

if [ ${RESULT} -eq 1 ]; then

	MODULE_PATH="`sysctl -n kern.module_path`;@@PREFIX@@/modules"

	sysctl "kern.module_path=${MODULE_PATH}"

else

	MODULE_PATH=`sysctl -n kern.module_path`

fi

grep "kern\.module_path" ${SYSCTL_CONFIG} > /dev/null 2>&1; RESULT=$?

if [ ${RESULT} -eq 0 ]; then

	# Variable present

	grep "kern\.module_path" ${SYSCTL_CONFIG} | grep "[:space:;=]@@PREFIX@@/modules[;]\?\b" ${SYSCTL_CONFIG} > /dev/null 2>&1; RESULT=$?

	if [ ${RESULT} -eq 1 ]; then

		# Not present in variable, so add

		ESC_PREFIX=`echo '@@PREFIX@@' | sed -e 's/\//\\\\\//g'`

		sed -i .orig -e 's/kern\.module_path[:space:]*=[:space:]*["]*\([[:alnum:][:space:]\.,;\/_-]*\)["]*/kern\.module_path="\1;'${ESC_PREFIX}'\/modules"/g' ${SYSCTL_CONFIG}

	fi

else

	# Not present.

	echo kern.module_path="${MODULE_PATH}" >> ${SYSCTL_CONFIG}

fi

kldstat -n fuse > /dev/null 2>&1; RESULT=$?

if [ ${RESULT} -eq 0 ]; then

	kldunload -n fuse > /dev/null 2>&1; RESULT=$?

	if [ ${RESULT} -ne 0 ]; then

		echo 'NOTICE: Failed to unload the Fuse module!'

		echo 'NOTICE: Is fuse.ko in use?'

	fi

fi

grep fusefs_enable ${LOADER_CONFIG} > /dev/null 2>&1; RESULT=$?

if [ ${RESULT} -eq 0 ]; then

	# Present, we should leave it alone

#	sed -e s/fusefs_enable.*/fuse_load=\"YES\"/g -i.orig ${LOADER_CONFIG}

else

	# Not present. First time install, so lets start it up

	echo 'fusefs_enable="YES"' >> ${LOADER_CONFIG}

fi

@@PREFIX@@/etc/rc.d/fusefs start > /dev/null 2>&1 ; RESULT=$?

if [ ${RESULT} -ne 0 ]; then

	echo 'NOTICE: Failed to load the Fuse module!'

	echo 'NOTICE: Unload and load Fuse module manually, or reboot.'

fi