r14109: Modulify the smbcalls subsystem.

(This used to be commit d538eac9dbfdd786b533cb5fbbd35ab2fd7358ba)

8 files changed, 119 insertions, 82 deletions

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 22130b6b7a..480b6e31e4 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,4 +1,6 @@
 - sonames
+- hack for loading modules locally
+ - create 
 - saner names for some of the .pc files
 - .pc files also when there is a public header?
 - get rid of include/structs.h and include/proto.h
@@ -9,3 +11,4 @@
   - include line in Makefile
   - rule in Makefile
 - determine dependencies from #include lines ?
+- install (parts of ?) autogenerated headers
diff --git a/source4/dynconfig.h b/source4/dynconfig.h
index a26a2c0c83..141be06656 100644
--- a/source4/dynconfig.h
+++ b/source4/dynconfig.h
@@ -25,7 +25,8 @@
  * @brief Exported global configurations.
  **/
 
-extern const char *dyn_SBINDIR, *dyn_BINDIR;
+extern const char *dyn_SBINDIR;
+extern const char *dyn_BINDIR;
 extern const char *dyn_CONFIGFILE;
 extern const char *dyn_NCALRPCDIR;
 extern const char *dyn_LOGFILEBASE;
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index 8d311bfa64..df2075d4e3 100644
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -1 +1 @@
-SMB_ENABLE(libldb_sqlite3,$with_sqlite3_support)
+SMB_ENABLE(ldb_sqlite3,$with_sqlite3_support)
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index b87c816402..da9f5f7076 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -1,76 +1,76 @@
 ################################################
-# Start MODULE libldb_asq
-[MODULE::libldb_asq]
+# Start MODULE ldb_asq
+[MODULE::ldb_asq]
 INIT_FUNCTION = ldb_asq_init
 SUBSYSTEM = ldb
 OBJ_FILES = \
 		modules/asq.o
-# End MODULE libldb_asq
+# End MODULE ldb_asq
 ################################################
 
 ################################################
-# Start MODULE libldb_sort
-[MODULE::libldb_sort]
+# Start MODULE ldb_sort
+[MODULE::ldb_sort]
 INIT_FUNCTION = ldb_sort_init
 SUBSYSTEM = ldb
 OBJ_FILES = \
 		modules/sort.o
-# End MODULE libldb_sort
+# End MODULE ldb_sort
 ################################################
 
 ################################################
-# Start MODULE libldb_paged_results
-[MODULE::libldb_paged_results]
+# Start MODULE ldb_paged_results
+[MODULE::ldb_paged_results]
 INIT_FUNCTION = ldb_paged_results_init
 SUBSYSTEM = ldb
 OBJ_FILES = \
 		modules/paged_results.o
-# End MODULE libldb_paged_results
+# End MODULE ldb_paged_results
 ################################################
 
 ################################################
-# Start MODULE libldb_operational
-[MODULE::libldb_operational]
+# Start MODULE ldb_operational
+[MODULE::ldb_operational]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_operational_init
 OBJ_FILES = \
 		modules/operational.o
-# End MODULE libldb_operational
+# End MODULE ldb_operational
 ################################################
 
 ################################################
-# Start MODULE libldb_objectclass
-[MODULE::libldb_objectclass]
+# Start MODULE ldb_objectclass
+[MODULE::ldb_objectclass]
 INIT_FUNCTION = ldb_objectclass_init
 SUBSYSTEM = ldb
 OBJ_FILES = \
 		modules/objectclass.o
-# End MODULE libldb_objectclass
+# End MODULE ldb_objectclass
 ################################################
 
 ################################################
-# Start MODULE libldb_rdn_name
-[MODULE::libldb_rdn_name]
+# Start MODULE ldb_rdn_name
+[MODULE::ldb_rdn_name]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_rdn_name_init
 OBJ_FILES = \
 		modules/rdn_name.o
-# End MODULE libldb_rdn_name
+# End MODULE ldb_rdn_name
 ################################################
 
 ################################################
-# Start MODULE libldb_schema
-[MODULE::libldb_schema]
+# Start MODULE ldb_schema
+[MODULE::ldb_schema]
 INIT_FUNCTION = ldb_schema_init
 SUBSYSTEM = ldb
 OBJ_FILES = \
 		modules/schema.o
-# End MODULE libldb_schema
+# End MODULE ldb_schema
 ################################################
 
 ################################################
-# Start MODULE libldb_ildap
-[MODULE::libldb_ildap]
+# Start MODULE ldb_ildap
+[MODULE::ldb_ildap]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_ildap_init
 OBJ_FILES = \
@@ -78,29 +78,29 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI_LDAP
 NOPROTO = YES
-# End MODULE libldb_ildap
+# End MODULE ldb_ildap
 ################################################
 
 ################################################
-# Start MODULE libldb_map
-[MODULE::libldb_map]
+# Start MODULE ldb_map
+[MODULE::ldb_map]
 SUBSYSTEM = ldb
 OBJ_FILES = modules/ldb_map.o
-# End MODULE libldb_map
+# End MODULE ldb_map
 ################################################
 
 ################################################
-# Start MODULE libldb_skel
-[MODULE::libldb_skel]
+# Start MODULE ldb_skel
+[MODULE::ldb_skel]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_skel_init
 OBJ_FILES = modules/skel.o
-# End MODULE libldb_skel
+# End MODULE ldb_skel
 ################################################
 
 ################################################
-# Start MODULE libldb_sqlite3
-[MODULE::libldb_sqlite3]
+# Start MODULE ldb_sqlite3
+[MODULE::ldb_sqlite3]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_sqlite3_init
 OBJ_FILES = \
@@ -108,12 +108,12 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		EXT_LIB_SQLITE3
 NOPROTO = YES
-# End MODULE libldb_sqlite3
+# End MODULE ldb_sqlite3
 ################################################
 
 ################################################
-# Start MODULE libldb_tdb
-[MODULE::libldb_tdb]
+# Start MODULE ldb_tdb
+[MODULE::ldb_tdb]
 SUBSYSTEM = ldb
 INIT_FUNCTION = ldb_tdb_init
 OBJ_FILES = \
@@ -126,7 +126,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		LIBTDB
 NOPROTO = YES
-# End MODULE libldb_tdb
+# End MODULE ldb_tdb
 ################################################
 
 ################################################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 768c186a63..6296272dfe 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -548,56 +548,56 @@ REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_
 [MODULE::RPC_EJS_ECHO]
 INIT_FUNCTION = ejs_init_rpcecho
 OBJ_FILES = gen_ndr/ndr_echo_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
 NOPROTO = YES
 
 [MODULE::RPC_EJS_MISC]
 INIT_FUNCTION = ejs_init_misc
 OBJ_FILES = gen_ndr/ndr_misc_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC
 NOPROTO = YES
 
 [MODULE::RPC_EJS_SAMR]
 INIT_FUNCTION = ejs_init_samr
 OBJ_FILES = gen_ndr/ndr_samr_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
 NOPROTO = YES
 
 [MODULE::RPC_EJS_SECURITY]
 INIT_FUNCTION = ejs_init_security
 OBJ_FILES = gen_ndr/ndr_security_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY
 NOPROTO = YES
 
 [MODULE::RPC_EJS_LSA]
 INIT_FUNCTION = ejs_init_lsarpc
 OBJ_FILES = gen_ndr/ndr_lsa_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
 NOPROTO = YES
 
 [MODULE::RPC_EJS_DFS]
 INIT_FUNCTION = ejs_init_netdfs
 OBJ_FILES = gen_ndr/ndr_dfs_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
 NOPROTO = YES
 
 [MODULE::RPC_EJS_DRSUAPI]
 INIT_FUNCTION = ejs_init_drsuapi
 OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
 NOPROTO = YES
 
 [MODULE::RPC_EJS_SPOOLSS]
 INIT_FUNCTION = ejs_init_spoolss
 OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 ENABLE = NO
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
 NOPROTO = YES
@@ -605,55 +605,55 @@ NOPROTO = YES
 [MODULE::RPC_EJS_WKSSVC]
 INIT_FUNCTION = ejs_init_wkssvc
 OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
 NOPROTO = YES
 
 [MODULE::RPC_EJS_SRVSVC]
 INIT_FUNCTION = ejs_init_srvsvc
 OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
 NOPROTO = YES
 
 [MODULE::RPC_EJS_EVENTLOG]
 INIT_FUNCTION = ejs_init_eventlog
 OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
 NOPROTO = YES
 
 [MODULE::RPC_EJS_WINREG]
 INIT_FUNCTION = ejs_init_winreg
 OBJ_FILES = gen_ndr/ndr_winreg_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
 NOPROTO = YES
 
 [MODULE::RPC_EJS_INITSHUTDOWN]
 INIT_FUNCTION = ejs_init_initshutdown
 OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
 NOPROTO = YES
 
 [MODULE::RPC_EJS_NETLOGON]
 INIT_FUNCTION = ejs_init_netlogon
 OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON
 NOPROTO = YES
 
 [MODULE::RPC_EJS_SVCCTL]
 INIT_FUNCTION = ejs_init_svcctl
 OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
 NOPROTO = YES
 
 [MODULE::RPC_EJS_IRPC]
 INIT_FUNCTION = ejs_init_irpc
 OBJ_FILES = gen_ndr/ndr_irpc_ejs.o
-SUBSYSTEM = SMBCALLS
+SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC
 NOPROTO = YES
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 3e71e48196..e330e022a4 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -7,32 +7,75 @@ NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
 
+[MODULE::smbcalls_config]
+OBJ_FILES = smbcalls_config.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_config
+
+[MODULE::smbcalls_ldb]
+OBJ_FILES = smbcalls_ldb.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_ldb
+
+[MODULE::smbcalls_nbt]
+OBJ_FILES = smbcalls_nbt.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_nbt
+
+[MODULE::smbcalls_samba3]
+OBJ_FILES = smbcalls_samba3.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_samba3
+REQUIRED_SUBSYSTEMS = LIBSAMBA3 
+
+
+[MODULE::smbcalls_rand]
+OBJ_FILES = smbcalls_rand.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_random
+
+[MODULE::smbcalls_nss]
+OBJ_FILES = smbcalls_nss.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_nss
+
+[MODULE::smbcalls_data]
+OBJ_FILES = smbcalls_data.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_datablob
+
+[MODULE::smbcalls_auth]
+OBJ_FILES = smbcalls_auth.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_auth
+REQUIRED_SUBSYSTEMS = auth
+
+[MODULE::smbcalls_string]
+OBJ_FILES = smbcalls_string.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_string
+
+[MODULE::smbcalls_sys]
+OBJ_FILES = smbcalls_sys.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_system
+
 #######################
-# Start LIBRARY SMBCALLS
-[SUBSYSTEM::SMBCALLS]
+# Start LIBRARY smbcalls
+[SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		smbcalls.o \
-		smbcalls_config.o \
-		smbcalls_ldb.o \
-		smbcalls_nbt.o \
 		smbcalls_cli.o \
 		smbcalls_rpc.o \
-		smbcalls_auth.o \
 		smbcalls_options.o \
-		smbcalls_nss.o \
-		smbcalls_string.o \
-		smbcalls_data.o \
-		smbcalls_rand.o \
-		smbcalls_sys.o \
 		smbcalls_creds.o \
-		smbcalls_samba3.o \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = \
-		auth EJS LIBBASIC \
-		EJSRPC MESSAGING LIBSAMBA3 \
+		EJS LIBBASIC \
+		EJSRPC MESSAGING \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
@@ -52,7 +95,7 @@ REQUIRED_SUBSYSTEMS = \
 		RPC_EJS_NETLOGON \
 		RPC_EJS_DRSUAPI \
 		RPC_EJS_IRPC
-# End SUBSYSTEM SMBCALLS
+# End SUBSYSTEM smbcalls
 #######################
 
 #######################
@@ -61,6 +104,6 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC smbcalls CONFIG 
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 13281f88e9..5aab8cf2c2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -127,23 +127,13 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 void smb_setup_ejs_functions(void)
 {
-	init_module_fn static_init[] = STATIC_SMBCALLS_MODULES;
+	init_module_fn static_init[] = STATIC_smbcalls_MODULES;
 	init_module_fn *shared_init;
 
-	smb_setup_ejs_config();
-	smb_setup_ejs_ldb();
-	smb_setup_ejs_nbt();
 	smb_setup_ejs_cli();
-	smb_setup_ejs_auth();
 	smb_setup_ejs_options();
-	smb_setup_ejs_nss();
-	smb_setup_ejs_string();
-	smb_setup_ejs_random();
-	smb_setup_ejs_system();
 	smb_setup_ejs_credentials();
-	smb_setup_ejs_samba3();
 	smb_setup_ejs_param();
-	smb_setup_ejs_datablob();
 	
 	ejsnet_setup();
 
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index 04f0266ecd..a0d5be7c37 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -7,6 +7,6 @@ PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		web_server.o \
 		http.o
-REQUIRED_SUBSYSTEMS = ESP LIBTLS SMBCALLS
+REQUIRED_SUBSYSTEMS = ESP LIBTLS smbcalls
 # End SUBSYSTEM WEB
 #######################