From edd05ae9d671c9209d630c68a1aff5c5cca8ee32 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 20 Nov 2008 08:16:52 -0500 Subject: Start conversion from a fork() and live to a fork()/exec() model. To start the dameon now you need to pass the option -s monitor Still have some problems communicating with children. --- server/nss/nsssrv.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'server/nss/nsssrv.c') diff --git a/server/nss/nsssrv.c b/server/nss/nsssrv.c index 0181644d..764de846 100644 --- a/server/nss/nsssrv.c +++ b/server/nss/nsssrv.c @@ -413,49 +413,45 @@ done: return retval; } -void nss_task_init(struct task_server *task) +int nss_process_init(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct confdb_ctx *cdb) { struct nss_ctx *nctx; int ret; - task_server_set_title(task, "sssd[nsssrv]"); - - nctx = talloc_zero(task, struct nss_ctx); + nctx = talloc_zero(mem_ctx, struct nss_ctx); if (!nctx) { - task_server_terminate(task, "fatal error initializing nss_ctx\n"); - return; - } - nctx->ev = task->event_ctx; - nctx->task = task; - - ret = confdb_init(task, task->event_ctx, &nctx->cdb); - if (ret != EOK) { - task_server_terminate(task, "fatal error initializing confdb\n"); - return; + DEBUG(0, ("fatal error initializing nss_ctx\n")); + return ENOMEM; } + nctx->ev = ev; + nctx->cdb = cdb; ret = nss_init_domains(nctx); if (ret != EOK) { - task_server_terminate(task, "fatal error setting up domain map\n"); - return; + DEBUG(0, ("fatal error setting up domain map\n")); + return ret; } ret = nss_sbus_init(nctx); if (ret != EOK) { - task_server_terminate(task, "fatal error setting up message bus\n"); - return; + DEBUG(0, ("fatal error setting up message bus\n")); + return ret; } - ret = nss_ldb_init(nctx, nctx->ev, nctx->cdb, &nctx->lctx); + ret = nss_ldb_init(nctx, ev, cdb, &nctx->lctx); if (ret != EOK) { - task_server_terminate(task, "fatal error initializing nss_ctx\n"); - return; + DEBUG(0, ("fatal error initializing nss_ctx\n")); + return ret; } /* after all initializations we are ready to listen on our socket */ ret = set_unix_socket(nctx); if (ret != EOK) { - task_server_terminate(task, "fatal error initializing socket\n"); - return; + DEBUG(0, ("fatal error initializing socket\n")); + return ret; } + + return EOK; } -- cgit