CVS: ----------------------------------------------------------------------

CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: 	Makefile.in configure.in include/includes.h include/ntvfs.h
CVS: 	include/smb.h lib/iconv.c lib/module.c ntvfs/ntvfs_base.c
CVS: 	ntvfs/cifs/vfs_cifs.c ntvfs/ipc/vfs_ipc.c
CVS: 	ntvfs/posix/vfs_posix.c ntvfs/print/vfs_print.c
CVS: 	ntvfs/reference/vfs_ref.c ntvfs/simple/vfs_simple.c
CVS: 	passdb/pdb_interface.c
CVS: Added Files:
CVS: 	include/module.h
CVS: ----------------------------------------------------------------------
Update to the modules system. Fixed:
 - get rid of smb_probe_module
 - merge older updates from 3.0
 - introduced register_subsystem() and register_backend() functions
 - adapt ntvfs and charset to use new register functions
 - made smb_load_modules() work recursively (e.g. 'preload modules = /usr/lib/samba')
 - got rid of some old remains

Things that still need work:
 - Did I break tankFS? I don't think so, but I can't test it here :-(
 - Add 'postload modules = ' (for modules that need to be loaded after fork() in smbd, if applicable)
 - Convert RPC, auth, passdb, etc to use new register_{subsystem,backend}() functions
 - Accept wildcards in 'preload modules' option, instead of loading recursively
(This used to be commit 7512b9ab1a8b3103f7a6c13f736353c46a26b668)

1 files changed, 8 insertions, 6 deletions

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 1afdb66a1c..3903203505 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -672,12 +672,15 @@ static NTSTATUS cvfs_trans2(struct request_context *req, struct smb_trans2 *tran
 /*
   initialise the CIFS->CIFS backend, registering ourselves with the ntvfs subsystem
  */
-BOOL cifs_vfs_init(void)
+NTSTATUS ntvfs_cifs_init(void)
 {
-	BOOL ret;
+	NTSTATUS ret;
 	struct ntvfs_ops ops;
 
 	ZERO_STRUCT(ops);
+
+	ops.name = "cifs";
+	ops.type = NTVFS_DISK;
 	
 	/* fill in all the operations */
 	ops.connect = cvfs_connect;
@@ -712,12 +715,11 @@ BOOL cifs_vfs_init(void)
 
 	/* register ourselves with the NTVFS subsystem. We register under the name 'cifs'. */
 
-	ret = ntvfs_register("cifs", NTVFS_DISK, &ops);
+	ret = register_backend("ntvfs", &ops);
 
-	if (!ret) {
+	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register CIFS backend!\n"));
-		return False;
 	}
 	
-	return True;
+	return ret;
 }