summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-25 23:53:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:48 -0500
commitb3e493470f3465cfe5cfa958b019ac8cfb8f12f2 (patch)
treecfde60cc60782142cfd7caa39692e1f92bafdffe /source4/smbd
parentfbb0ecd418286499d5e251893f46a7a4352d719c (diff)
downloadsamba-b3e493470f3465cfe5cfa958b019ac8cfb8f12f2.tar.gz
samba-b3e493470f3465cfe5cfa958b019ac8cfb8f12f2.tar.bz2
samba-b3e493470f3465cfe5cfa958b019ac8cfb8f12f2.zip
r7911: task_terminate() is defined in the macosx headers, so change the name
to task_server_terminate() (This used to be commit a7447e25ac203f0ee09ffdf72df1094eb70e7c0c)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/service_task.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index c09cf2a0ac..c6784e7132 100644
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -29,11 +29,11 @@
/*
terminate a task service
*/
-void task_terminate(struct task_server *task, const char *reason)
+void task_server_terminate(struct task_server *task, const char *reason)
{
struct event_context *event_ctx = task->event_ctx;
const struct model_ops *model_ops = task->model_ops;
- DEBUG(0,("task_terminate: [%s]\n", reason));
+ DEBUG(0,("task_server_terminate: [%s]\n", reason));
talloc_free(task);
model_ops->terminate(event_ctx, reason);
}
@@ -63,7 +63,7 @@ static void task_server_callback(struct event_context *event_ctx, uint32_t serve
task->msg_ctx = messaging_init(task, task->server_id, task->event_ctx);
if (!task->msg_ctx) {
- task_terminate(task, "messaging_init() failed");
+ task_server_terminate(task, "messaging_init() failed");
return;
}