WIP more abortsss

cyrusimap · Jun 26, 2024 · 5ac6f9a · 5ac6f9a
1 parent d21b200
commit 5ac6f9a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/backup/backupd.c b/backup/backupd.c
@@ -173,6 +173,9 @@ EXPORTED void fatal(const char* s, int code)
         prot_flush(backupd_out);
     }
     syslog(LOG_ERR, "Fatal error: %s", s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(code);
 }
 

diff --git a/backup/ctl_backups.c b/backup/ctl_backups.c
@@ -72,6 +72,9 @@ EXPORTED void fatal(const char *error, int code)
 {
     fprintf(stderr, "fatal error: %s\n", error);
     cyrus_done();
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }
 

diff --git a/backup/cyr_backup.c b/backup/cyr_backup.c
@@ -75,6 +75,9 @@ EXPORTED void fatal(const char *error, int code)
 {
     fprintf(stderr, "fatal error: %s\n", error);
     cyrus_done();
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }
 

diff --git a/backup/restore.c b/backup/restore.c
@@ -68,6 +68,9 @@ EXPORTED void fatal(const char *s, int code)
 {
     fprintf(stderr, "Fatal error: %s\n", s);
     syslog(LOG_ERR, "Fatal error: %s", s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }
 

diff --git a/netnews/remotepurge.c b/netnews/remotepurge.c
@@ -147,6 +147,9 @@ EXPORTED void fatal(const char *s, int code)
         syslog(LOG_ERR, "fatal error: %s", s);
         fprintf(stderr, "fatal error: %s\n", s);
     }
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }
 

diff --git a/timsieved/timsieved.c b/timsieved/timsieved.c
@@ -198,6 +198,8 @@ EXPORTED void fatal(const char *s, int code)
     prot_printf(sieved_out, "NO Fatal error: %s\r\n", s);
     prot_flush(sieved_out);
 
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(EX_TEMPFAIL);
 }