summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/cldap_server/cldap_server.c2
-rw-r--r--source4/dsdb/repl/drepl_service.c2
-rw-r--r--source4/kdc/kdc.c2
-rw-r--r--source4/ldap_server/ldap_server.c2
-rw-r--r--source4/nbt_server/nbt_server.c2
-rw-r--r--source4/rpc_server/service_rpc.c2
-rw-r--r--source4/smb_server/smb_server.c2
-rw-r--r--source4/smbd/service_task.c3
-rw-r--r--source4/web_server/web_server.c2
-rw-r--r--source4/winbind/wb_server.c2
-rw-r--r--source4/wrepl_server/wrepl_server.c2
11 files changed, 12 insertions, 11 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index d68637104d..944d679a2d 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -209,7 +209,7 @@ static void cldapd_task_init(struct task_server *task)
*/
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, model_ops, cldapd_task_init);
+ return task_server_startup(event_ctx, lp_ctx, "cldap", model_ops, cldapd_task_init);
}
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index e212407e24..246309e16f 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -185,7 +185,7 @@ static void dreplsrv_task_init(struct task_server *task)
*/
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, model_ops, dreplsrv_task_init);
+ return task_server_startup(event_ctx, lp_ctx, "drepl", model_ops, dreplsrv_task_init);
}
/*
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 04e7ddd2ff..d820f0abe9 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -667,7 +667,7 @@ 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, model_ops, kdc_task_init);
+ return task_server_startup(event_ctx, lp_ctx, "kdc", model_ops, kdc_task_init);
}
/* called at smbd startup - register ourselves as a server service */
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 8380775c28..f9c763eec7 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -584,7 +584,7 @@ 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, model_ops,
+ return task_server_startup(event_context, lp_ctx, "ldap", model_ops,
ldapsrv_task_init);
}
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 1718ef7f2e..bcdc63e984 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -93,7 +93,7 @@ static void nbtd_task_init(struct task_server *task)
*/
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,
+ return task_server_startup(event_ctx, lp_ctx, "nbt",
model_ops, nbtd_task_init);
}
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 46916135f9..855e120ced 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -465,7 +465,7 @@ 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,
+ return task_server_startup(event_context, lp_ctx, "rpc",
model_ops, dcesrv_task_init);
}
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index cbff585e21..866ae26fa4 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -258,7 +258,7 @@ 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,
+ return task_server_startup(event_context, lp_ctx, "smb",
model_ops, smbsrv_task_init);
}
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index 08588464cc..2274685059 100644
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -85,6 +85,7 @@ static void task_server_callback(struct event_context *event_ctx,
*/
NTSTATUS task_server_startup(struct event_context *event_ctx,
struct loadparm_context *lp_ctx,
+ const char *service_name,
const struct model_ops *model_ops,
void (*task_init)(struct task_server *))
{
@@ -96,7 +97,7 @@ NTSTATUS task_server_startup(struct event_context *event_ctx,
state->task_init = task_init;
state->model_ops = model_ops;
- model_ops->new_task(event_ctx, lp_ctx, task_server_callback, state);
+ model_ops->new_task(event_ctx, lp_ctx, service_name, task_server_callback, state);
return NT_STATUS_OK;
}
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 9ff67f78f3..bd212cff7d 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -298,7 +298,7 @@ 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,
+ return task_server_startup(event_context, lp_ctx, "web",
model_ops, websrv_task_init);
}
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index eaba6609f3..9acde4a557 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -208,7 +208,7 @@ 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,
+ return task_server_startup(event_ctx, lp_ctx, "winbind",
model_ops, winbind_task_init);
}
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 50ef7e8550..d13482dd98 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -510,7 +510,7 @@ static NTSTATUS wreplsrv_init(struct event_context *event_ctx, struct loadparm_c
return NT_STATUS_OK;
}
- return task_server_startup(event_ctx, lp_ctx,
+ return task_server_startup(event_ctx, lp_ctx, "wrepl",
model_ops, wreplsrv_task_init);
}