X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=a1180673c7f72a228460466cbe56acd37f529c84;hp=287b628b0d2e7ffee18886f8885f58882d6e155a;hb=94c7c613f4c66a36c81edae74a42024015122c16;hpb=8eb5a15bfcc068e8d2504bb84b14455e9fc7c3ba

diff --git a/server.c b/server.c
index 287b628b..a1180673 100644
--- a/server.c
+++ b/server.c
@@ -166,7 +166,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 /*
  * setup shared memory area and get mutex for locking
  */
-static void shm_init(void)
+static void init_ipc_or_die(void)
 {
 	void *shm;
 	int ret = shm_new(sizeof(struct misc_meta_data));
@@ -198,7 +198,7 @@ err_out:
 	exit(EXIT_FAILURE);
 }
 
-static void parse_config(int override)
+static void parse_config_or_die(int override)
 {
 	char *home = para_homedir();
 	struct stat statbuf;
@@ -259,7 +259,7 @@ static void handle_sighup(void)
 	PARA_NOTICE_LOG("SIGHUP\n");
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
-	parse_config(1); /* reopens log */
+	parse_config_or_die(1); /* reopens log */
 	init_user_list(user_list_file); /* reload user list */
 	if (mmd->afs_pid)
 		kill(mmd->afs_pid, SIGHUP);
@@ -482,11 +482,11 @@ static void server_init(int argc, char **argv)
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);
-	para_drop_privileges(conf.user_arg, conf.group_arg);
+	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
-	parse_config(0);
+	parse_config_or_die(0);
 	log_welcome("para_server", conf.loglevel_arg);
-	shm_init(); /* init mmd struct */
+	init_ipc_or_die(); /* init mmd struct and mmd->lock */
 	/* make sure, the global now pointer is uptodate */
 	gettimeofday(now, NULL);
 	server_uptime(UPTIME_SET); /* reset server uptime */