Commita3c6d10

committed

Move the check for whether walreceiver has authenticated as a superuser

from walsender.c, where it didn't really belong, to postinit.c where it doesbelong (and is essentially free, too).

1 parentea46000 commita3c6d10Copy full SHA for a3c6d10

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`*`
`32`	`32`	`* IDENTIFICATION`
`33`		`- * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.16 2010/04/12 10:18:50 heikki Exp $`
	`33`	`+ * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.17 2010/04/21 00:51:56 tgl Exp $`
`34`	`34`	`*`
`35`	`35`	`*-------------------------------------------------------------------------`
`36`	`36`	`*/`
`@@ -47,13 +47,13 @@`
`47`	`47`	`#include"replication/walsender.h"`
`48`	`48`	`#include"storage/fd.h"`
`49`	`49`	`#include"storage/ipc.h"`
`50`		`-#include"storage/lock.h"`
`51`	`50`	`#include"storage/pmsignal.h"`
`52`	`51`	`#include"tcop/tcopprot.h"`
`53`	`52`	`#include"utils/guc.h"`
`54`	`53`	`#include"utils/memutils.h"`
`55`	`54`	`#include"utils/ps_status.h"`
`56`	`55`
	`56`	`+`
`57`	`57`	`/* Array of WalSnds in shared memory */`
`58`	`58`	`WalSndCtlData*WalSndCtl=NULL;`
`59`	`59`
`@@ -114,11 +114,6 @@ WalSenderMain(void)`
`114`	`114`	`{`
`115`	`115`	`MemoryContextwalsnd_context;`
`116`	`116`
`117`		`-if (!superuser())`
`118`		`-ereport(FATAL,`
`119`		`-(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`120`		`-errmsg("must be superuser to start walsender")));`
`121`		`-`
`122`	`117`	`if (RecoveryInProgress())`
`123`	`118`	`ereport(FATAL,`
`124`	`119`	`(errcode(ERRCODE_CANNOT_CONNECT_NOW),`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.210 2010/04/20 23:48:47 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.211 2010/04/21 00:51:57 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`@@ -624,6 +624,11 @@ InitPostgres(const char in_dbname, Oid dboid, const char username,`
`624`	`624`	`if (am_walsender)`
`625`	`625`	`{`
`626`	`626`	`Assert(!bootstrap);`
	`627`	`+/* must have authenticated as a superuser */`
	`628`	`+if (!am_superuser)`
	`629`	`+ereport(FATAL,`
	`630`	`+(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
	`631`	`+errmsg("must be superuser to start walsender")));`
`627`	`632`	`/* report this backend in the PgBackendStatus array */`
`628`	`633`	`pgstat_bestart();`
`629`	`634`	`/* close the transaction we started above */`

Comments

(0)