X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fserver%2Fcitserver.c;fp=citadel%2Fserver%2Fcitserver.c;h=a6c9505967fec1c16ea2eb0874c8f83063332a4e;hp=da0865899516b30e7c93a4eb44d81d0493a07b3f;hb=99efe55958ebc96ab99b052dc67864ea1db64a62;hpb=605133afb3d87139c657794d647c3a49df8b6a47

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index da0865899..a6c950596 100644
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -29,24 +29,8 @@ int panic_fd;
 
 // We need pseudo-random numbers for a few things.  Seed generously.
 void seed_random_number_generator(void) {
-	FILE *urandom;
-	struct timeval tv;
-	unsigned int seed;
-
-	syslog(LOG_INFO, "Seeding the pseudo-random number generator...");
-	urandom = fopen("/dev/urandom", "r");
-	if (urandom != NULL) {
-		if (fread(&seed, sizeof seed, 1, urandom) == -1) {
-			syslog(LOG_ERR, "citserver: failed to read random seed: %m");
-		}
-		fclose(urandom);
-	}
-	else {
-		gettimeofday(&tv, NULL);
-		seed = tv.tv_usec;
-	}
-	srand(seed);
-	srandom(seed);
+	syslog(LOG_INFO, "citserver: seeding the pseudo-random number generator");
+	srand(time(NULL) + getpid() + clock());
 }
 
 
@@ -56,10 +40,10 @@ void master_startup(void) {
 	struct passwd *pw;
 	gid_t gid;
 
-	syslog(LOG_DEBUG, "master_startup() started");
+	syslog(LOG_DEBUG, "citserver: master_startup() started");
 	time(&server_startup_time);
 
-	syslog(LOG_INFO, "Checking directory access");
+	syslog(LOG_INFO, "citserver: checking directory access");
 	if ((pw = getpwuid(ctdluid)) == NULL) {
 		gid = getgid();
 	}
@@ -77,13 +61,13 @@ void master_startup(void) {
 	syslog(LOG_DEBUG, "citserver: ctdl_key_dir is %s", ctdl_key_dir);
 	syslog(LOG_DEBUG, "citserver: ctdl_run_dir is %s", ctdl_run_dir);
 
-	syslog(LOG_INFO, "Opening databases");
+	syslog(LOG_INFO, "citserver: opening databases");
 	cdb_init_backends();
 	cdb_open_databases();
 
 	// Load site-specific configuration
 	seed_random_number_generator();					// must be done before config system
-	syslog(LOG_INFO, "Initializing configuration system");
+	syslog(LOG_INFO, "citserver: initializing configuration system");
 	initialize_config_system();
 	validate_config();
 	migrate_legacy_control_record();
@@ -98,7 +82,7 @@ void master_startup(void) {
 	// Check floor reference counts
 	check_ref_counts();
 
-	syslog(LOG_INFO, "Creating base rooms (if necessary)");
+	syslog(LOG_INFO, "citserver: creating base rooms (if necessary)");
 	CtdlCreateRoom(CtdlGetConfigStr("c_baseroom"), 0, "", 0, 1, 0, VIEW_BBS);
 	CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS);
 	CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS);
@@ -116,7 +100,7 @@ void master_startup(void) {
 		CtdlPutRoomLock(&qrbuf);
 	}
 
-	syslog(LOG_DEBUG, "master_startup() finished");
+	syslog(LOG_DEBUG, "citserver: master_startup() finished");
 }