sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-07 12:23:51 +03:00
Code Activity

r7911: task_terminate() is defined in the macosx headers, so change the name

Browse Source 
to task_server_terminate()
This commit is contained in:
Andrew Tridgell
2005-06-25 23:53:14 +00:00
committed by Gerald (Jerry) Carter
parent d2e9e95ea2
commit a7447e25ac
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/cldap_server/cldap_server.c
View File

@@ -120,13 +120,13 @@ static void cldapd_task_init(struct task_server *task)
NTSTATUS status;
if (iface_count() == 0) {
task_terminate(task, "cldapd: no network interfaces configured");
task_server_terminate(task, "cldapd: no network interfaces configured");
return;
}
cldapd = talloc(task, struct cldapd_server);
if (cldapd == NULL) {
task_terminate(task, "cldapd: out of memory");
task_server_terminate(task, "cldapd: out of memory");
return;
}
@@ -136,7 +136,7 @@ static void cldapd_task_init(struct task_server *task)
/* start listening on the configured network interfaces */
status = cldapd_startup_interfaces(cldapd);
if (!NT_STATUS_IS_OK(status)) {
task_terminate(task, "cldapd failed to setup interfaces");
task_server_terminate(task, "cldapd failed to setup interfaces");
return;
}
}

14
source/kdc/kdc.c
View File

@@ -235,13 +235,13 @@ static void kdc_task_init(struct task_server *task)
krb5_error_code ret;
if (iface_count() == 0) {
task_terminate(task, "kdc: no network interfaces configured");
task_server_terminate(task, "kdc: no network interfaces configured");
return;
}
kdc = talloc(task, struct kdc_server);
if (kdc == NULL) {
task_terminate(task, "kdc: out of memory");
task_server_terminate(task, "kdc: out of memory");
return;
}
@@ -250,7 +250,7 @@ static void kdc_task_init(struct task_server *task)
/* Setup the KDC configuration */
kdc->config = talloc(kdc, struct krb5_kdc_configuration);
if (!kdc->config) {
task_terminate(task, "kdc: out of memory");
task_server_terminate(task, "kdc: out of memory");
return;
}
krb5_kdc_default_config(kdc->config);
@@ -264,14 +264,14 @@ static void kdc_task_init(struct task_server *task)
if (ret) {
DEBUG(1,("kdc_task_init: krb5_init_context failed (%s)\n",
error_message(ret)));
task_terminate(task, "kdc: krb5_init_context failed");
task_server_terminate(task, "kdc: krb5_init_context failed");
return;
}
kdc->config->logf = kdc->smb_krb5_context->logf;
kdc->config->db = talloc(kdc->config, struct HDB *);
if (!kdc->config->db) {
task_terminate(task, "kdc: out of memory");
task_server_terminate(task, "kdc: out of memory");
return;
}
kdc->config->num_db = 1;
@@ -281,14 +281,14 @@ static void kdc_task_init(struct task_server *task)
if (ret != 0) {
DEBUG(1, ("kdc_task_init: hdb_ldb_create fails: %s\n",
smb_get_krb5_error_message(kdc->smb_krb5_context->krb5_context, ret, kdc)));
task_terminate(task, "kdc: hdb_ldb_create failed");
task_server_terminate(task, "kdc: hdb_ldb_create failed");
return;
}
/* start listening on the configured network interfaces */
status = kdc_startup_interfaces(kdc);
if (!NT_STATUS_IS_OK(status)) {
task_terminate(task, "kdc failed to setup interfaces");
task_server_terminate(task, "kdc failed to setup interfaces");
return;
}
}

2
source/ldap_server/ldap_server.c
View File

@@ -461,7 +461,7 @@ static void ldapsrv_task_init(struct task_server *task)
return;
failed:
task_terminate(task, "Failed to startup ldap server task");
task_server_terminate(task, "Failed to startup ldap server task");
}
/*

10
source/nbt_server/nbt_server.c
View File

@@ -54,13 +54,13 @@ static void nbtd_task_init(struct task_server *task)
NTSTATUS status;
if (iface_count() == 0) {
task_terminate(task, "nbtd: no network interfaces configured");
task_server_terminate(task, "nbtd: no network interfaces configured");
return;
}
nbtsrv = talloc(task, struct nbtd_server);
if (nbtsrv == NULL) {
task_terminate(task, "nbtd: out of memory");
task_server_terminate(task, "nbtd: out of memory");
return;
}
@@ -72,14 +72,14 @@ static void nbtd_task_init(struct task_server *task)
/* start listening on the configured network interfaces */
status = nbtd_startup_interfaces(nbtsrv);
if (!NT_STATUS_IS_OK(status)) {
task_terminate(task, "nbtd failed to setup interfaces");
task_server_terminate(task, "nbtd failed to setup interfaces");
return;
}
/* start the WINS server, if appropriate */
status = nbtd_winsserver_init(nbtsrv);
if (!NT_STATUS_IS_OK(status)) {
task_terminate(task, "nbtd failed to start WINS server");
task_server_terminate(task, "nbtd failed to start WINS server");
return;
}
@@ -87,7 +87,7 @@ static void nbtd_task_init(struct task_server *task)
status = IRPC_REGISTER(task->msg_ctx, irpc, NBTD_INFORMATION,
nbtd_information, nbtsrv);
if (!NT_STATUS_IS_OK(status)) {
task_terminate(task, "nbtd failed to setup monitoring");
task_server_terminate(task, "nbtd failed to setup monitoring");
return;
}

6
source/smbd/service_task.c
View File

@@ -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;
}

2
source/web_server/web_server.c
View File

@@ -248,7 +248,7 @@ static void websrv_task_init(struct task_server *task)
return;
failed:
task_terminate(task, "Failed to startup web server task");
task_server_terminate(task, "Failed to startup web server task");
}

6
source/winbind/wb_server.c
View File

@@ -150,7 +150,7 @@ static void winbind_task_init(struct task_server *task)
stream_setup_socket() call. */
model_ops = process_model_byname("single");
if (!model_ops) {
task_terminate(task, "Can't find 'single' process model_ops");
task_server_terminate(task, "Can't find 'single' process model_ops");
return;
}
@@ -164,7 +164,7 @@ static void winbind_task_init(struct task_server *task)
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("service_setup_stream_socket(path=%s) failed - %s\n",
WINBINDD_ECHO_SOCKET, nt_errstr(status)));
task_terminate(task, "winbind Failed to find to ECHO unix socket");
task_server_terminate(task, "winbind Failed to find to ECHO unix socket");
return;
}
@@ -175,7 +175,7 @@ static void winbind_task_init(struct task_server *task)
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("service_setup_stream_socket(address=%s,port=%u) failed - %s\n",
WINBINDD_ECHO_ADDR, port, nt_errstr(status)));
task_terminate(task, "winbind Failed to find to ECHO tcp socket");
task_server_terminate(task, "winbind Failed to find to ECHO tcp socket");
return;
}
}