svn commit: samba r26403 - in branches/SAMBA_4_0: . source/ntvfs

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-11 22:23:25 +0000 (Tue, 11 Dec 2007)
New Revision: 26403

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26403

Log:
Make sure ntvfs is only initialized once.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c	2007-12-11 22:23:20 UTC (rev 26402)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c	2007-12-11 22:23:25 UTC (rev 26403)
@@ -201,9 +201,15 @@
 
 NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx)
 {
+	static bool initialized = false;
 	init_module_fn static_init[] = STATIC_ntvfs_MODULES;
-	init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "ntvfs");
+	init_module_fn *shared_init;
 
+	if (initialized) return NT_STATUS_OK;
+	initialized = true;
+	
+	shared_init = load_samba_modules(NULL, lp_ctx, "ntvfs");
+
 	run_init_functions(static_init);
 	run_init_functions(shared_init);