diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-18 18:05:55 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-18 18:05:55 -0700 |
| commit | e9a589feac531379e569bc39d803b16179002cfa (patch) | |
| tree | 81fcaf840fa0ed4513e4d17d6e20f47434ca5ac5 /source4/dsdb/kcc | |
| parent | ade5d43c5ceb915dd2210a735a21fd9bed531dd3 (diff) | |
| download | samba-e9a589feac531379e569bc39d803b16179002cfa.tar.gz samba-e9a589feac531379e569bc39d803b16179002cfa.tar.bz2 samba-e9a589feac531379e569bc39d803b16179002cfa.zip | |
s4-server: kill main daemon if a task fails to initialise
When one of our core tasks fails to initialise it can now ask for the
server as a whole to die, rather than limping along in a degraded
state.
Diffstat (limited to 'source4/dsdb/kcc')
| -rw-r--r-- | source4/dsdb/kcc/kcc_periodic.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/kcc/kcc_service.c | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index 3af79d8b89..dae0c1e235 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -172,7 +172,7 @@ static void kccsrv_periodic_handler_te(struct tevent_context *ev, struct tevent_ status = kccsrv_periodic_schedule(service, service->periodic.interval); if (!W_ERROR_IS_OK(status)) { - task_server_terminate(service->task, win_errstr(status)); + task_server_terminate(service->task, win_errstr(status), true); return; } } diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c index 2279879000..32e09ac989 100644 --- a/source4/dsdb/kcc/kcc_service.c +++ b/source4/dsdb/kcc/kcc_service.c @@ -151,10 +151,10 @@ static void kccsrv_task_init(struct task_server *task) switch (lp_server_role(task->lp_ctx)) { case ROLE_STANDALONE: - task_server_terminate(task, "kccsrv: no KCC required in standalone configuration"); + task_server_terminate(task, "kccsrv: no KCC required in standalone configuration", false); return; case ROLE_DOMAIN_MEMBER: - task_server_terminate(task, "kccsrv: no KCC required in domain member configuration"); + task_server_terminate(task, "kccsrv: no KCC required in domain member configuration", false); return; case ROLE_DOMAIN_CONTROLLER: /* Yes, we want a KCC */ @@ -165,7 +165,7 @@ static void kccsrv_task_init(struct task_server *task) service = talloc_zero(task, struct kccsrv_service); if (!service) { - task_server_terminate(task, "kccsrv_task_init: out of memory"); + task_server_terminate(task, "kccsrv_task_init: out of memory", true); return; } service->task = task; @@ -174,9 +174,10 @@ static void kccsrv_task_init(struct task_server *task) status = kccsrv_init_creds(service); if (!W_ERROR_IS_OK(status)) { - task_server_terminate(task, talloc_asprintf(task, - "kccsrv: Failed to obtain server credentials: %s\n", - win_errstr(status))); + task_server_terminate(task, + talloc_asprintf(task, + "kccsrv: Failed to obtain server credentials: %s\n", + win_errstr(status)), true); return; } @@ -184,7 +185,7 @@ static void kccsrv_task_init(struct task_server *task) if (!W_ERROR_IS_OK(status)) { task_server_terminate(task, talloc_asprintf(task, "kccsrv: Failed to connect to local samdb: %s\n", - win_errstr(status))); + win_errstr(status)), true); return; } @@ -192,7 +193,7 @@ static void kccsrv_task_init(struct task_server *task) if (!W_ERROR_IS_OK(status)) { task_server_terminate(task, talloc_asprintf(task, "kccsrv: Failed to load partitions: %s\n", - win_errstr(status))); + win_errstr(status)), true); return; } @@ -205,7 +206,7 @@ static void kccsrv_task_init(struct task_server *task) if (!W_ERROR_IS_OK(status)) { task_server_terminate(task, talloc_asprintf(task, "kccsrv: Failed to periodic schedule: %s\n", - win_errstr(status))); + win_errstr(status)), true); return; } |