Module Name:    src
Committed By:   tron
Date:           Sat Jul  9 14:50:01 UTC 2011

Modified Files:
        src/lib/librefuse: refuse.c

Log Message:
Don't ignore "userdata" argument in "fuse_main_real". This can crash
a FUSE file-system that passes a non-NULL argument here.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/lib/librefuse/refuse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/librefuse/refuse.c
diff -u src/lib/librefuse/refuse.c:1.92 src/lib/librefuse/refuse.c:1.93
--- src/lib/librefuse/refuse.c:1.92	Thu Mar  5 01:21:57 2009
+++ src/lib/librefuse/refuse.c	Sat Jul  9 14:50:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: refuse.c,v 1.92 2009/03/05 01:21:57 msaitoh Exp $	*/
+/*	$NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $	*/
 
 /*
  * Copyright © 2007 Alistair Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: refuse.c,v 1.92 2009/03/05 01:21:57 msaitoh Exp $");
+__RCSID("$NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -1221,8 +1221,8 @@
 	int		 multithreaded;
 	int		 fd;
 
-	fuse = fuse_setup(argc, argv, ops, size, &mountpoint, &multithreaded,
-			&fd);
+	fuse = fuse_setup_real(argc, argv, ops, size, &mountpoint,
+	    &multithreaded, &fd, userdata);
 
 	return fuse_loop(fuse);
 }

Reply via email to