git.samba.org
/
bbaumbach
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3c5fbe
)
Remove useless layer of indirection, where every service called
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 4 Feb 2008 10:58:29 +0000
(21:58 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 4 Feb 2008 10:58:29 +0000
(21:58 +1100)
task_service_init() manually. Now this is called from service.c for
all services.
Andrew Bartlett
(This used to be commit
9c9a4731cafd0dcf6c8523a7b06759cd4f14e4db
)
source4/cldap_server/cldap_server.c
patch
|
blob
|
history
source4/dsdb/repl/drepl_service.c
patch
|
blob
|
history
source4/kdc/kdc.c
patch
|
blob
|
history
source4/ldap_server/ldap_server.c
patch
|
blob
|
history
source4/nbt_server/nbt_server.c
patch
|
blob
|
history
source4/rpc_server/service_rpc.c
patch
|
blob
|
history
source4/smb_server/smb_server.c
patch
|
blob
|
history
source4/smbd/service.c
patch
|
blob
|
history
source4/web_server/web_server.c
patch
|
blob
|
history
source4/winbind/wb_server.c
patch
|
blob
|
history
source4/wrepl_server/wrepl_server.c
patch
|
blob
|
history
diff --git
a/source4/cldap_server/cldap_server.c
b/source4/cldap_server/cldap_server.c
index 944d679a2d5d546e45413fd688c502ed0f2a17c0..7858ee2cf0a13e54e48db48fb00ac0b557c70490 100644
(file)
--- a/
source4/cldap_server/cldap_server.c
+++ b/
source4/cldap_server/cldap_server.c
@@
-204,19
+204,10
@@
static void cldapd_task_init(struct task_server *task)
}
}
-/*
- initialise the cldapd server
- */
-static NTSTATUS cldapd_init(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const struct model_ops *model_ops)
-{
- return task_server_startup(event_ctx, lp_ctx, "cldap", model_ops, cldapd_task_init);
-}
-
-
/*
register ourselves as a available server
*/
NTSTATUS server_service_cldapd_init(void)
{
/*
register ourselves as a available server
*/
NTSTATUS server_service_cldapd_init(void)
{
- return register_server_service("cldap", cldapd_init);
+ return register_server_service("cldap", cldapd_
task_
init);
}
}
diff --git
a/source4/dsdb/repl/drepl_service.c
b/source4/dsdb/repl/drepl_service.c
index 246309e16f4ba32663af48619fc90f7219f13eeb..3375059e99e00e58976f4a0af4e59105ad4dcd63 100644
(file)
--- a/
source4/dsdb/repl/drepl_service.c
+++ b/
source4/dsdb/repl/drepl_service.c
@@
-180,18
+180,10
@@
static void dreplsrv_task_init(struct task_server *task)
irpc_add_name(task->msg_ctx, "dreplsrv");
}
irpc_add_name(task->msg_ctx, "dreplsrv");
}
-/*
- initialise the dsdb replicator service
- */
-static NTSTATUS dreplsrv_init(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const struct model_ops *model_ops)
-{
- return task_server_startup(event_ctx, lp_ctx, "drepl", model_ops, dreplsrv_task_init);
-}
-
/*
register ourselves as a available server
*/
NTSTATUS server_service_drepl_init(void)
{
/*
register ourselves as a available server
*/
NTSTATUS server_service_drepl_init(void)
{
- return register_server_service("drepl", dreplsrv_init);
+ return register_server_service("drepl", dreplsrv_
task_
init);
}
}
diff --git
a/source4/kdc/kdc.c
b/source4/kdc/kdc.c
index d820f0abe97668b14f304d9c3e908591745bf11b..52ee4758625ae975adae437d26892c27e44a006b 100644
(file)
--- a/
source4/kdc/kdc.c
+++ b/
source4/kdc/kdc.c
@@
-660,18
+660,8
@@
static void kdc_task_init(struct task_server *task)
}
}
-/*
- called on startup of the KDC service
-*/
-static NTSTATUS kdc_init(struct event_context *event_ctx,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_ctx, lp_ctx, "kdc", model_ops, kdc_task_init);
-}
-
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_kdc_init(void)
{
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_kdc_init(void)
{
- return register_server_service("kdc", kdc_init);
+ return register_server_service("kdc", kdc_
task_
init);
}
}
diff --git
a/source4/ldap_server/ldap_server.c
b/source4/ldap_server/ldap_server.c
index f9c763eec781257f2f8d812bd5d07d8b10e86342..5b2519c035a7845d9d152c3bccdea1da867562c4 100644
(file)
--- a/
source4/ldap_server/ldap_server.c
+++ b/
source4/ldap_server/ldap_server.c
@@
-576,20
+576,8
@@
failed:
task_server_terminate(task, "Failed to startup ldap server task");
}
task_server_terminate(task, "Failed to startup ldap server task");
}
-/*
- called on startup of the web server service It's job is to start
- listening on all configured sockets
-*/
-static NTSTATUS ldapsrv_init(struct event_context *event_context,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_context, lp_ctx, "ldap", model_ops,
- ldapsrv_task_init);
-}
-
NTSTATUS server_service_ldap_init(void)
{
NTSTATUS server_service_ldap_init(void)
{
- return register_server_service("ldap", ldapsrv_init);
+ return register_server_service("ldap", ldapsrv_
task_
init);
}
}
diff --git
a/source4/nbt_server/nbt_server.c
b/source4/nbt_server/nbt_server.c
index bcdc63e984dbfe3610fa4748c3b85bad2e62f9c6..2ac1fb4ef3fb2cc766b7507269d1998261e56185 100644
(file)
--- a/
source4/nbt_server/nbt_server.c
+++ b/
source4/nbt_server/nbt_server.c
@@
-88,20
+88,10
@@
static void nbtd_task_init(struct task_server *task)
}
}
-/*
- initialise the nbt server
- */
-static NTSTATUS nbtd_init(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const struct model_ops *model_ops)
-{
- return task_server_startup(event_ctx, lp_ctx, "nbt",
- model_ops, nbtd_task_init);
-}
-
-
/*
register ourselves as a available server
*/
NTSTATUS server_service_nbtd_init(void)
{
/*
register ourselves as a available server
*/
NTSTATUS server_service_nbtd_init(void)
{
- return register_server_service("nbt", nbtd_init);
+ return register_server_service("nbt", nbtd_
task_
init);
}
}
diff --git
a/source4/rpc_server/service_rpc.c
b/source4/rpc_server/service_rpc.c
index 855e120cede1b7e8d2ab11ed80a8b59078150544..ddcf1c2a999166172aec47e42e207786a3c57c26 100644
(file)
--- a/
source4/rpc_server/service_rpc.c
+++ b/
source4/rpc_server/service_rpc.c
@@
-457,18
+457,6
@@
failed:
task_server_terminate(task, "Failed to startup dcerpc server task");
}
task_server_terminate(task, "Failed to startup dcerpc server task");
}
-/*
- called on startup of the smb server service It's job is to start
- listening on all configured sockets
-*/
-static NTSTATUS dcesrv_init(struct event_context *event_context,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_context, lp_ctx, "rpc",
- model_ops, dcesrv_task_init);
-}
-
NTSTATUS server_service_rpc_init(void)
{
init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
NTSTATUS server_service_rpc_init(void)
{
init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
@@
-479,5
+467,5
@@
NTSTATUS server_service_rpc_init(void)
talloc_free(shared_init);
talloc_free(shared_init);
- return register_server_service("rpc", dcesrv_init);
+ return register_server_service("rpc", dcesrv_
task_
init);
}
}
diff --git
a/source4/smb_server/smb_server.c
b/source4/smb_server/smb_server.c
index 866ae26fa46f44bde2ebd3a71e9b0af136d69916..9a8a8cf5c4643d0b18041f001acc84fcf7880faa 100644
(file)
--- a/
source4/smb_server/smb_server.c
+++ b/
source4/smb_server/smb_server.c
@@
-250,20
+250,8
@@
failed:
task_server_terminate(task, "Failed to startup smb server task");
}
task_server_terminate(task, "Failed to startup smb server task");
}
-/*
- called on startup of the smb server service It's job is to start
- listening on all configured sockets
-*/
-static NTSTATUS smbsrv_init(struct event_context *event_context,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_context, lp_ctx, "smb",
- model_ops, smbsrv_task_init);
-}
-
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_smb_init(void)
{
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_smb_init(void)
{
- return register_server_service("smb", smbsrv_init);
+ return register_server_service("smb", smbsrv_
task_
init);
}
}
diff --git
a/source4/smbd/service.c
b/source4/smbd/service.c
index 525b24561616b72bdbecead985e6aadc167cbb62..2b1fcc4bd87e6eed0ce4308ccf051cc17f54679f 100644
(file)
--- a/
source4/smbd/service.c
+++ b/
source4/smbd/service.c
@@
-30,20
+30,20
@@
static struct registered_server {
struct registered_server *next, *prev;
const char *service_name;
static struct registered_server {
struct registered_server *next, *prev;
const char *service_name;
-
NTSTATUS (*service_init)(struct event_context *, struct loadparm_context *lp_ctx, const struct model_ops
*);
+
void (*task_init)(struct task_server
*);
} *registered_servers;
/*
register a server service.
*/
NTSTATUS register_server_service(const char *name,
} *registered_servers;
/*
register a server service.
*/
NTSTATUS register_server_service(const char *name,
-
NTSTATUS (*service_init)(struct event_context *, struct loadparm_context *lp_ctx, const struct model_ops
*))
+
void (*task_init)(struct task_server
*))
{
struct registered_server *srv;
srv = talloc(talloc_autofree_context(), struct registered_server);
NT_STATUS_HAVE_NO_MEMORY(srv);
srv->service_name = name;
{
struct registered_server *srv;
srv = talloc(talloc_autofree_context(), struct registered_server);
NT_STATUS_HAVE_NO_MEMORY(srv);
srv->service_name = name;
- srv->
service_init = service
_init;
+ srv->
task_init = task
_init;
DLIST_ADD_END(registered_servers, srv, struct registered_server *);
return NT_STATUS_OK;
}
DLIST_ADD_END(registered_servers, srv, struct registered_server *);
return NT_STATUS_OK;
}
@@
-53,14
+53,15
@@
NTSTATUS register_server_service(const char *name,
initialise a server service
*/
static NTSTATUS server_service_init(const char *name,
initialise a server service
*/
static NTSTATUS server_service_init(const char *name,
- struct event_context *event_c
tx
,
+ struct event_context *event_c
ontext
,
struct loadparm_context *lp_ctx,
const struct model_ops *model_ops)
{
struct registered_server *srv;
for (srv=registered_servers; srv; srv=srv->next) {
if (strcasecmp(name, srv->service_name) == 0) {
struct loadparm_context *lp_ctx,
const struct model_ops *model_ops)
{
struct registered_server *srv;
for (srv=registered_servers; srv; srv=srv->next) {
if (strcasecmp(name, srv->service_name) == 0) {
- return srv->service_init(event_ctx, lp_ctx, model_ops);
+ return task_server_startup(event_context, lp_ctx, srv->service_name,
+ model_ops, srv->task_init);
}
}
return NT_STATUS_INVALID_SYSTEM_SERVICE;
}
}
return NT_STATUS_INVALID_SYSTEM_SERVICE;
diff --git
a/source4/web_server/web_server.c
b/source4/web_server/web_server.c
index bd212cff7d28df7fcaa37c7703a2f0b60fad60c4..ac83a3384d5cd3f145d934948654fc126c61ae59 100644
(file)
--- a/
source4/web_server/web_server.c
+++ b/
source4/web_server/web_server.c
@@
-290,20
+290,8
@@
failed:
}
}
-/*
- called on startup of the web server service It's job is to start
- listening on all configured sockets
-*/
-static NTSTATUS websrv_init(struct event_context *event_context,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_context, lp_ctx, "web",
- model_ops, websrv_task_init);
-}
-
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_web_init(void)
{
/* called at smbd startup - register ourselves as a server service */
NTSTATUS server_service_web_init(void)
{
- return register_server_service("web", websrv_init);
+ return register_server_service("web", websrv_
task_
init);
}
}
diff --git
a/source4/winbind/wb_server.c
b/source4/winbind/wb_server.c
index 9acde4a557cb31bfa2a30f5584c7a99c4e9d20fd..9b303f36158f32507e69ef5d3bbad7b07cb588c1 100644
(file)
--- a/
source4/winbind/wb_server.c
+++ b/
source4/winbind/wb_server.c
@@
-201,21
+201,10
@@
nomem:
return;
}
return;
}
-/*
- initialise the winbind server
- */
-static NTSTATUS winbind_init(struct event_context *event_ctx,
- struct loadparm_context *lp_ctx,
- const struct model_ops *model_ops)
-{
- return task_server_startup(event_ctx, lp_ctx, "winbind",
- model_ops, winbind_task_init);
-}
-
/*
register ourselves as a available server
*/
NTSTATUS server_service_winbind_init(void)
{
/*
register ourselves as a available server
*/
NTSTATUS server_service_winbind_init(void)
{
- return register_server_service("winbind", winbind_init);
+ return register_server_service("winbind", winbind_
task_
init);
}
}
diff --git
a/source4/wrepl_server/wrepl_server.c
b/source4/wrepl_server/wrepl_server.c
index d13482dd98d036452aad293706a08b533ccf1fa8..e750d9355aeb3f5d6a78b70afcc4103e2bd9d394 100644
(file)
--- a/
source4/wrepl_server/wrepl_server.c
+++ b/
source4/wrepl_server/wrepl_server.c
@@
-453,6
+453,10
@@
static void wreplsrv_task_init(struct task_server *task)
NTSTATUS status;
struct wreplsrv_service *service;
NTSTATUS status;
struct wreplsrv_service *service;
+ if (!lp_wins_support(task->lp_ctx)) {
+ return;
+ }
+
task_server_set_title(task, "task[wreplsrv]");
service = talloc_zero(task, struct wreplsrv_service);
task_server_set_title(task, "task[wreplsrv]");
service = talloc_zero(task, struct wreplsrv_service);
@@
-501,23
+505,10
@@
static void wreplsrv_task_init(struct task_server *task)
irpc_add_name(task->msg_ctx, "wrepl_server");
}
irpc_add_name(task->msg_ctx, "wrepl_server");
}
-/*
- initialise the WREPL server
- */
-static NTSTATUS wreplsrv_init(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const struct model_ops *model_ops)
-{
- if (!lp_wins_support(lp_ctx)) {
- return NT_STATUS_OK;
- }
-
- return task_server_startup(event_ctx, lp_ctx, "wrepl",
- model_ops, wreplsrv_task_init);
-}
-
/*
register ourselves as a available server
*/
NTSTATUS server_service_wrepl_init(void)
{
/*
register ourselves as a available server
*/
NTSTATUS server_service_wrepl_init(void)
{
- return register_server_service("wrepl", wreplsrv_init);
+ return register_server_service("wrepl", wreplsrv_
task_
init);
}
}