Commit470d886

committed

Use PostmasterRandom(), not random(), for DSM control segment ID.

Otherwise, every startup gets the same "random" value, which isdefinitely not what was intended.

1 parent419113d commit470d886Copy full SHA for 470d886

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,6 @@ static void processCancelRequest(Port port, void pkt);`
`403`	`403`	`staticintinitMasks(fd_set*rmask);`
`404`	`404`	`staticvoidreport_fork_failure_to_client(Port*port,interrnum);`
`405`	`405`	`staticCAC_statecanAcceptConnections(void);`
`406`		`-staticlongPostmasterRandom(void);`
`407`	`406`	`staticvoidRandomSalt(char*salt,intlen);`
`408`	`407`	`staticvoidsignal_child(pid_tpid,intsignal);`
`409`	`408`	`staticboolSignalSomeChildren(intsignal,inttargets);`
`@@ -5101,7 +5100,7 @@ RandomSalt(char *salt, int len)`
`5101`	`5100`	`/*`
`5102`	`5101`	`* PostmasterRandom`
`5103`	`5102`	`*/`
`5104`		`-staticlong`
	`5103`	`+long`
`5105`	`5104`	`PostmasterRandom(void)`
`5106`	`5105`	`{`
`5107`	`5106`	`/*`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`#include"lib/ilist.h"`
`38`	`38`	`#include"miscadmin.h"`
	`39`	`+#include"postmaster/postmaster.h"`
`39`	`40`	`#include"storage/dsm.h"`
`40`	`41`	`#include"storage/ipc.h"`
`41`	`42`	`#include"storage/lwlock.h"`
`@@ -181,7 +182,7 @@ dsm_postmaster_startup(PGShmemHeader *shim)`
`181`	`182`	`{`
`182`	`183`	`Assert(dsm_control_address==NULL);`
`183`	`184`	`Assert(dsm_control_mapped_size==0);`
`184`		`-dsm_control_handle=random();`
	`185`	`+dsm_control_handle=(dsm_handle)PostmasterRandom();`
`185`	`186`	`if (dsm_control_handle==0)`
`186`	`187`	`continue;`
`187`	`188`	`if (dsm_impl_op(DSM_OP_CREATE,dsm_control_handle,segsize,`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ extern const char *progname;`
`48`	`48`
`49`	`49`	`externvoidPostmasterMain(intargc,char*argv[])pg_attribute_noreturn();`
`50`	`50`	`externvoidClosePostmasterPorts(boolam_syslogger);`
	`51`	`+externlongPostmasterRandom(void);`
`51`	`52`
`52`	`53`	`externintMaxLivePostmasterChildren(void);`
`53`	`54`

Comments

(0)