Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3784bb2b 3784bb2b0953098df3383bb8299232ea72bf0221 by Sergey Poznyakoff
Options

(imap4d_bye0): Use util_is_master() and util_bye()

1 parent caa977bf
Inline Side-by-side
Showing 1 changed file with 2 additions and 7 deletions
...@@ -44,7 +44,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command) ...@@ -44,7 +44,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
44 break; 44 break;
45 45
46 case ERR_SIGNAL: 46 case ERR_SIGNAL:
47 if (util_is_ofile()) 47 if (!util_is_master ())
48 util_out (RESP_BYE, "Quitting on signal"); 48 util_out (RESP_BYE, "Quitting on signal");
49 syslog (LOG_ERR, _("Quitting on signal")); 49 syslog (LOG_ERR, _("Quitting on signal"));
50 break; 50 break;
...@@ -79,12 +79,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command) ...@@ -79,12 +79,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
79 if (status == EXIT_SUCCESS && command) 79 if (status == EXIT_SUCCESS && command)
80 util_finish (command, RESP_OK, "Completed"); 80 util_finish (command, RESP_OK, "Completed");
81 81
82 #ifdef WITH_TLS 82 util_bye ();
83 if (tls_done)
84 imap4d_deinit_tls_server ();
85 if (tls_available)
86 mu_deinit_tls_libs ();
87 #endif /* WITH_TLS */
88 83
89 closelog (); 84 closelog ();
90 exit (status); 85 exit (status);
......