diff options
author | Jeremy Allison <jra@samba.org> | 2009-01-13 15:42:29 -0800 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-01-20 14:16:45 +0100 |
commit | 1d5ff6d55091d430e76722223ea6c8204b55398e (patch) | |
tree | 0b4b38b454b62e8d156f8706fe1fae279aac5dd2 | |
parent | caed80e66252222f99f9e85223e9ca0378104ba8 (diff) | |
download | samba-1d5ff6d55091d430e76722223ea6c8204b55398e.tar.gz |
From boyang - ensure we never "return" from a forked child, always _exit().
Jeremy.
(cherry picked from commit c2515026807e08c7836ef1bd6220bd7eab3a1a5b)
-rw-r--r-- | source/winbindd/winbindd_cm.c | 6 | ||||
-rw-r--r-- | source/winbindd/winbindd_dual.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index fa28bfa053f..0102f4ff06a 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/winbindd/winbindd_cm.c @@ -216,7 +216,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain) if (!override_logfile) { if (asprintf(&lfile, "%s/log.winbindd-dc-connect", get_dyn_LOGFILEBASE()) == -1) { DEBUG(0, ("fork_child_dc_connect: out of memory.\n")); - return false; + _exit(1); } } @@ -226,7 +226,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain) MSG_WINBIND_FAILED_TO_GO_ONLINE, (uint8 *)domain->name, strlen(domain->name)+1); - _exit(0); + _exit(1); } SAFE_FREE(lfile); @@ -238,7 +238,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain) MSG_WINBIND_FAILED_TO_GO_ONLINE, (uint8 *)domain->name, strlen(domain->name)+1); - _exit(0); + _exit(1); } if ((!get_dcs(mem_ctx, domain, &dcs, &num_dcs)) || (num_dcs == 0)) { diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c index a20b628c6b9..5f9b2505271 100644 --- a/source/winbindd/winbindd_dual.c +++ b/source/winbindd/winbindd_dual.c @@ -1393,7 +1393,7 @@ static bool fork_domain_child(struct winbindd_child *child) DEBUG(0,("select error occured\n")); TALLOC_FREE(frame); perror("select"); - return False; + _exit(1); } /* fetch a request from the main daemon */ @@ -1401,7 +1401,7 @@ static bool fork_domain_child(struct winbindd_child *child) if (state.finished) { /* we lost contact with our parent */ - exit(0); + _exit(0); } DEBUG(4,("child daemon request %d\n", (int)state.request.cmd)); |