summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/config.mk82
-rw-r--r--source4/smbd/process_model.c2
-rw-r--r--source4/smbd/process_model.mk12
-rw-r--r--source4/smbd/server.c2
4 files changed, 49 insertions, 49 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 3dfe129db7..5a0f920361 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -1,110 +1,110 @@
# server subsystem
################################################
-# Start MODULE server_service_auth
-[MODULE::server_service_auth]
+# Start MODULE service_auth
+[MODULE::service_auth]
INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
auth
# End MODULE server_auth
################################################
################################################
-# Start MODULE server_service_smb
-[MODULE::server_service_smb]
+# Start MODULE service_smb
+[MODULE::service_smb]
INIT_FUNCTION = server_service_smb_init
OUTPUT_TYPE = MERGEDOBJ
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
SMB
# End MODULE server_smb
################################################
################################################
-# Start MODULE server_service_rpc
-[MODULE::server_service_rpc]
+# Start MODULE service_rpc
+[MODULE::service_rpc]
INIT_FUNCTION = server_service_rpc_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
OUTPUT_TYPE = MERGEDOBJ
REQUIRED_SUBSYSTEMS = \
- DCERPC_SERVER
+ dcerpc_server
# End MODULE server_rpc
################################################
################################################
-# Start MODULE server_service_ldap
-[MODULE::server_service_ldap]
+# Start MODULE service_ldap
+[MODULE::service_ldap]
INIT_FUNCTION = server_service_ldap_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
LDAP
# End MODULE server_ldap
################################################
################################################
-# Start MODULE server_service_nbtd
-[MODULE::server_service_nbtd]
+# Start MODULE service_nbtd
+[MODULE::service_nbtd]
INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
NBTD
-# End MODULE server_service_nbtd
+# End MODULE service_nbtd
################################################
################################################
-# Start MODULE server_service_wrepl
-[MODULE::server_service_wrepl]
+# Start MODULE service_wrepl
+[MODULE::service_wrepl]
INIT_FUNCTION = server_service_wrepl_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
WREPL_SRV
-# End MODULE server_service_wrepl
+# End MODULE service_wrepl
################################################
################################################
-# Start MODULE server_service_cldapd
-[MODULE::server_service_cldap]
+# Start MODULE service_cldapd
+[MODULE::service_cldap]
INIT_FUNCTION = server_service_cldapd_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
CLDAPD
-# End MODULE server_service_cldapd
+# End MODULE service_cldapd
################################################
################################################
-# Start MODULE server_service_web
-[MODULE::server_service_web]
+# Start MODULE service_web
+[MODULE::service_web]
INIT_FUNCTION = server_service_web_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
WEB
-# End MODULE server_service_web
+# End MODULE service_web
################################################
################################################
-# Start MODULE server_service_web
-[MODULE::server_service_kdc]
+# Start MODULE service_web
+[MODULE::service_kdc]
INIT_FUNCTION = server_service_kdc_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
KDC
-# End MODULE server_service_web
+# End MODULE service_web
################################################
################################################
-# Start MODULE server_service_winbind
-[MODULE::server_service_winbind]
+# Start MODULE service_winbind
+[MODULE::service_winbind]
INIT_FUNCTION = server_service_winbind_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
WINBIND
-# End MODULE server_service_winbind
+# End MODULE service_winbind
################################################
#######################
-# Start SUBSYSTEM SERVICE
-[SUBSYSTEM::SERVER_SERVICE]
+# Start SUBSERVICE
+[SUBSYSTEM::service]
PRIVATE_PROTO_HEADER = service.h
OBJ_FILES = \
service.o \
@@ -123,8 +123,8 @@ MANPAGE = smbd.8
OBJ_FILES = \
server.o
REQUIRED_SUBSYSTEMS = \
- PROCESS_MODEL \
- SERVER_SERVICE \
+ process_model \
+ service \
CONFIG \
LIBBASIC \
PIDFILE \
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index 5010d745db..5a01ad4fab 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -82,7 +82,7 @@ NTSTATUS register_process_model(const void *_ops)
NTSTATUS process_model_init(void)
{
- init_module_fn static_init[] = STATIC_PROCESS_MODEL_MODULES;
+ init_module_fn static_init[] = STATIC_process_model_MODULES;
init_module_fn *shared_init = load_samba_modules(NULL, "process_model");
run_init_functions(static_init);
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index e09db012fb..c9fb73d0d3 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -4,7 +4,7 @@
# Start MODULE process_model_single
[MODULE::process_model_single]
INIT_FUNCTION = process_model_single_init
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
OBJ_FILES = \
process_single.o
# End MODULE process_model_single
@@ -14,7 +14,7 @@ OBJ_FILES = \
# Start MODULE process_model_standard
[MODULE::process_model_standard]
INIT_FUNCTION = process_model_standard_init
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
OBJ_FILES = \
process_standard.o
REQUIRED_SUBSYSTEMS = EXT_LIB_SETPROCTITLE
@@ -25,7 +25,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_SETPROCTITLE
# Start MODULE process_model_thread
[MODULE::process_model_thread]
INIT_FUNCTION = process_model_thread_init
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
OBJ_FILES = \
process_thread.o
REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
@@ -33,11 +33,11 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
################################################
################################################
-# Start SUBSYSTEM PROCESS_MODEL
-[SUBSYSTEM::PROCESS_MODEL]
+# Start SUBSYSTEM process_model
+[SUBSYSTEM::process_model]
PRIVATE_PROTO_HEADER = process_model_proto.h
OBJ_FILES = \
process_model.o
#
-# End SUBSYSTEM PROCESS_MODEL
+# End SUBSYSTEM process_model
################################################
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 057cdfd5e8..db2a13f29f 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -166,7 +166,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
BOOL interactive = False;
int opt;
poptContext pc;
- init_module_fn static_init[] = STATIC_SERVER_SERVICE_MODULES;
+ init_module_fn static_init[] = STATIC_service_MODULES;
init_module_fn *shared_init;
struct event_context *event_ctx;
NTSTATUS status;