Update for the new modules system. Also, use Makefile rather then Makefile.in

because we don't generate Makefile from configure anymore
(This used to be commit 0d322968cbf445df79153c0abc0d041edcf223ee)

diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile
similarity index 84%
rename from examples/VFS/Makefile.in
rename to examples/VFS/Makefile
index 30019caccd193585e77a0d50cf06132e5b7769e3..ac5a93b49ba814557ef67946de45c95ef21131aa 100644 (file)
--- a/examples/VFS/Makefile.in
+++ b/examples/VFS/Makefile
@@ -1,7 +1,6 @@
-CC             = @CC@
-CFLAGS         = @CFLAGS@
-CPPFLAGS       = @CPPFLAGS@
-LDFLAGS                = @LDFLAGS@
+CFLAGS         = 
+CPPFLAGS       =
+LDFLAGS                =
 LDSHFLAGS      = -shared
 srcdir         = ../../source/
 FLAGS          =  $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)

diff --git a/examples/VFS/skel.c b/examples/VFS/skel.c
index b9376828225a580832dfdaf899f42c008312b368..f19323480fc8cb182392e92abc8619cce4dd572e 100644 (file)
--- a/examples/VFS/skel.c
+++ b/examples/VFS/skel.c
@@ -437,12 +437,11 @@ static vfs_op_tuple skel_ops[] = {
 
 /* VFS initialisation - return initialized vfs_op_tuple array back to Samba */
 
-vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
+static vfs_op_tuple *skel_init(const struct vfs_ops *def_vfs_ops,
                        struct smb_vfs_handle_struct *vfs_handle)
 {
        DEBUG(3, ("Initialising default vfs hooks\n"));
 
-       *vfs_version = SMB_VFS_INTERFACE_VERSION;
        memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
        
        /* Remember vfs_handle for further allocation and referencing of private
@@ -452,8 +451,7 @@ vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
        return skel_ops;
 }
 
-/* VFS finalization function */
-void vfs_done(connection_struct *conn)
+int init_module(void)
 {
-       DEBUG(3, ("Finalizing default vfs hooks\n"));
+       return smb_register_vfs("skel", skel_init, SMB_VFS_INTERFACE_VERSION);
 }