X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=cde79e0f62a0d3d71b36b21026ea8986f0a6264a;hb=a520d904d0069654c57d2b69618bee1225ee3067;hp=b9648f6f70a3ba3b3b5759e992d1069477583070;hpb=425c3723bd35cf6e2048027e36c721a78784b8c7;p=citadel.git

diff --git a/citadel/citserver.c b/citadel/citserver.c
index b9648f6f7..cde79e0f6 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,7 +1,7 @@
 /* 
  * Main source module for the Citadel server
  *
- * Copyright (c) 1987-2020 by the citadel.org team
+ * Copyright (c) 1987-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -54,12 +54,13 @@ void master_startup(void)
 	syslog(LOG_INFO, "Checking directory access");
 	if ((pw = getpwuid(ctdluid)) == NULL) {
 		gid = getgid();
-	} else {
+	}
+	else {
 		gid = pw->pw_gid;
 	}
 
 	if (create_run_directories(CTDLUID, gid) != 0) {
-		syslog(LOG_EMERG, "failed to access & create directories");
+		syslog(LOG_ERR, "citserver: failed to access and create directories");
 		exit(1);
 	}
 	syslog(LOG_INFO, "Opening databases");
@@ -123,7 +124,6 @@ void master_startup(void)
  */
 int master_cleanup(int exitcode)
 {
-	struct CleanupFunctionHook *fcn;
 	static int already_cleaning_up = 0;
 
 	if (already_cleaning_up) {
@@ -133,11 +133,6 @@ int master_cleanup(int exitcode)
 	}
 	already_cleaning_up = 1;
 
-	/* Run any cleanup routines registered by loadable modules */
-	for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
-		(*fcn->h_function_pointer) ();
-	}
-
 	/* Do system-dependent stuff */
 	sysdep_master_cleanup();
 
@@ -145,7 +140,7 @@ int master_cleanup(int exitcode)
 	shutdown_config_system();
 
 	/* Close databases */
-	syslog(LOG_INFO, "Closing databases\n");
+	syslog(LOG_INFO, "citserver: closing databases");
 	close_databases();
 
 	/* If the operator requested a halt but not an exit, halt here. */