From c8297073dbaf19237891fd97d9e62dc00ad4e1f0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 22 Mar 2011 14:05:23 +1100 Subject: s3-fault: removed the cont_fn from fault_setup() cont_fn() was supposed to be a way to continue after a seg fault. It could never be called however, as smb_panic() from fault_report() could never return, as dump_core() never returns at the end of smb_panic() Autobuild-User: Andrew Tridgell Autobuild-Date: Tue Mar 22 05:07:58 CET 2011 on sn-devel-104 --- source3/smbd/server.c | 2 +- source3/smbd/server_exit.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 5d2abc0bd9..2c09dd26c5 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -986,7 +986,7 @@ extern void build_options(bool screen); gain_root_privilege(); gain_root_group_privilege(); - fault_setup((void (*)(void *))exit_server_fault); + fault_setup(); dump_core_setup("smbd"); /* we are never interested in SIGPIPE */ diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c index c5cdc29380..71f5094261 100644 --- a/source3/smbd/server_exit.c +++ b/source3/smbd/server_exit.c @@ -204,8 +204,3 @@ void exit_server_cleanly(const char *const explanation) { exit_server_common(SERVER_EXIT_NORMAL, explanation); } - -void exit_server_fault(void) -{ - exit_server("critical server fault"); -} -- cgit