summaryrefslogtreecommitdiff
path: root/lib/libfuse/fuse.c
diff options
context:
space:
mode:
authorSylvestre Gallon <syl@cvs.openbsd.org>2013-11-06 19:53:21 +0000
committerSylvestre Gallon <syl@cvs.openbsd.org>2013-11-06 19:53:21 +0000
commit11cf532e7208042d2808063a8b65ab64baad29bb (patch)
tree6ed69ed9e2528c62910c0a2612546515cb164ee2 /lib/libfuse/fuse.c
parent74443831deefcd7b44767cc8d037af29aaf37c2c (diff)
Handle fuse client private data. Needed by encfs.
Bump shlib_version. ok stsp@.
Diffstat (limited to 'lib/libfuse/fuse.c')
-rw-r--r--lib/libfuse/fuse.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libfuse/fuse.c b/lib/libfuse/fuse.c
index 81f6d5774a1..50dd9f1080d 100644
--- a/lib/libfuse/fuse.c
+++ b/lib/libfuse/fuse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse.c,v 1.12 2013/11/02 09:00:49 syl Exp $ */
+/* $OpenBSD: fuse.c,v 1.13 2013/11/06 19:53:20 syl Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -104,6 +104,7 @@ fuse_loop(struct fuse *fuse)
ctx.gid = fuse->conf.gid;
ctx.pid = fuse->conf.pid;
ctx.umask = fuse->conf.umask;
+ ctx.private_data = fuse->private_data;
ictx = &ctx;
ret = ifuse_exec_opcode(fuse, &fbuf);
@@ -242,6 +243,7 @@ fuse_new(struct fuse_chan *fc, unused struct fuse_args *args,
fuse->fc = fc;
fuse->max_ino = FUSE_ROOT_INO;
fuse->se.args = fuse;
+ fuse->private_data = userdata;
if ((root = alloc_vn(fuse, "/", FUSE_ROOT_INO, 0)) == NULL) {
free(fuse);