1010 *
1111 *
1212 * IDENTIFICATION
13- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.80 1998/06/04 17:26:41 momjian Exp $
13+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.81 1998/06/08 04:27:59 momjian Exp $
1414 *
1515 * NOTES
1616 *
@@ -198,6 +198,12 @@ staticsigset_toldsigmask,
198198static int orgsigmask = sigblock (0 );
199199#endif
200200
201+ static unsignedint random_seed = 0 ;
202+
203+ extern char * optarg ;
204+ extern int optind ,
205+ opterr ;
206+
201207
202208/*
203209 * postmaster.c - function prototypes
@@ -216,18 +222,14 @@ static int ServerLoop(void);
216222static int BackendStartup (Port * port );
217223static void readStartupPacket (char * arg ,PacketLen len ,char * pkt );
218224static int initMasks (fd_set * rmask ,fd_set * wmask );
225+ static long PostmasterRandom (void );
219226static void RandomSalt (char * salt );
220227
221228#ifdef CYR_RECODE
222- void GetCharSetByHost (char * ,int ,char * );
229+ void GetCharSetByHost (char * ,int ,char * );
223230
224231#endif
225232
226- extern char * optarg ;
227- extern int optind ,
228- opterr ;
229-
230-
231233
232234static void
233235checkDataDir (const char * DataDir ,bool * DataDirOK )
@@ -563,6 +565,10 @@ ServerLoop(void)
563565writemask ;
564566int nSockets ;
565567Dlelem * curr ;
568+ struct timeval now ,later ;
569+ struct timezone tz ;
570+
571+ gettimeofday (& now ,& tz );
566572
567573nSockets = initMasks (& readmask ,& writemask );
568574
@@ -596,6 +602,19 @@ ServerLoop(void)
596602return (STATUS_ERROR );
597603}
598604
605+ if (random_seed == 0 )
606+ {
607+ gettimeofday (& later ,& tz );
608+
609+ /*
610+ *We are not sure how much precision is in tv_usec, so we
611+ *swap the nibbles of 'later' and XOR them with 'now'
612+ */
613+ random_seed = now .tv_usec ^
614+ ((later .tv_usec <<16 ) |
615+ ((unsignedint )(later .tv_usec & 0xffff0000 ) >>16 ));
616+ }
617+
599618/*
600619 * [TRH] To avoid race conditions, block SIGCHLD signals while we
601620 * are handling the request. (both reaper() and ConnCreate()
@@ -1345,19 +1364,28 @@ CharRemap(long int ch)
13451364 */
13461365static void
13471366RandomSalt (char * salt )
1367+ {
1368+ long rand = PostmasterRandom ();
1369+
1370+ * salt = CharRemap (rand %62 );
1371+ * (salt + 1 )= CharRemap (rand /62 );
1372+ }
1373+
1374+ /*
1375+ * PostmasterRandom
1376+ */
1377+ static long
1378+ PostmasterRandom (void )
13481379{
13491380
13501381static bool initialized = false;
13511382
13521383if (!initialized )
13531384{
1354- time_t now ;
1355-
1356- now = time (NULL );
1357- srandom ((unsignedint )now );
1385+ Assert (random_seed != 0 && !IsUnderPostmaster );
1386+ srandom (random_seed );
13581387initialized = true;
13591388}
13601389
1361- * salt = CharRemap (random ());
1362- * (salt + 1 )= CharRemap (random ());
1390+ return ramdom () ^random_seed ;
13631391}