summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-26 21:58:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:46 -0500
commit09c44f6cae89621871d2e5475b0c0f99c25804b4 (patch)
tree053b1712c035bb63361bf549ba3bf13491412c3c /source4/smbd
parent6aafed9600a3fa05932668c70fc0e20f3724dab6 (diff)
downloadsamba-09c44f6cae89621871d2e5475b0c0f99c25804b4.tar.gz
samba-09c44f6cae89621871d2e5475b0c0f99c25804b4.tar.bz2
samba-09c44f6cae89621871d2e5475b0c0f99c25804b4.zip
r12500: Use init functions explicitly in a few more places. 'gensec' and 'librpc'
are the only two subsystems left to convert. (This used to be commit f6bbc72996aeee8607fc583140fd60be0e06e969)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_model.mk1
-rw-r--r--source4/smbd/server.c11
2 files changed, 11 insertions, 1 deletions
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 7028845475..b8f960215a 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -34,7 +34,6 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
################################################
# Start SUBSYSTEM PROCESS_MODEL
[SUBSYSTEM::PROCESS_MODEL]
-INIT_FUNCTION = process_model_init
OBJ_FILES = \
process_model.o
#
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 52221b096b..9fa7cad0c7 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -217,6 +217,17 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
smbd_init_subsystems;
+ registry_init(); /* FIXME: maybe run this in the initialization function
+ of the winreg RPC server instead? */
+
+ ntptr_init(); /* FIXME: maybe run this in the initialization function
+ of the spoolss RPC server instead? */
+
+ ntvfs_init(); /* FIXME: maybe run this in the initialization functions
+ of the SMB[,2] server instead? */
+
+ process_model_init();
+
shared_init = load_samba_modules(NULL, "service");
run_init_functions(static_init);