NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit6d239ee

committed

Allow non-super users to set log_duration to true, then false, when the

administrator has not turned it on, and fix other PGC_USERLIMITvariables.

1 parentb824576 commit6d239eeCopy full SHA for 6d239ee

File tree

1 file changed

+13

-13

lines changed

src/backend/utils/misc
- guc.c

1 file changed

+13

-13

lines changed

`‎src/backend/utils/misc/guc.c‎`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.154 2003/09/03 22:05:08 petere Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.155 2003/09/0405:11:20 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -2556,7 +2556,7 @@ set_config_option(const char name, const char value,`
`2556`	`2556`	`/* Limit non-superuser changes */`
`2557`	`2557`	`if (record->context==PGC_USERLIMIT&&`
`2558`	`2558`	`source>PGC_S_UNPRIVILEGED&&`
`2559`		`-newval<conf->session_val&&`
	`2559`	`+newval<conf->reset_val&&`
`2560`	`2560`	`!superuser())`
`2561`	`2561`	`{`
`2562`	`2562`	`ereport(elevel,`
`@@ -2569,8 +2569,8 @@ set_config_option(const char name, const char value,`
`2569`	`2569`	`/* Allow admin to override non-superuser setting */`
`2570`	`2570`	`if (record->context==PGC_USERLIMIT&&`
`2571`	`2571`	`source<PGC_S_UNPRIVILEGED&&`
`2572`		`-record->session_source>PGC_S_UNPRIVILEGED&&`
`2573`		`-newval>conf->session_val&&`
	`2572`	`+record->reset_source>PGC_S_UNPRIVILEGED&&`
	`2573`	`+newval>conf->reset_val&&`
`2574`	`2574`	`!superuser())`
`2575`	`2575`	`changeVal=changeVal_orig;`
`2576`	`2576`	`}`
`@@ -2652,8 +2652,8 @@ set_config_option(const char name, const char value,`
`2652`	`2652`	`/* Limit non-superuser changes */`
`2653`	`2653`	`if (record->context==PGC_USERLIMIT&&`
`2654`	`2654`	`source>PGC_S_UNPRIVILEGED&&`
`2655`		`-conf->session_val!=0&&`
`2656`		`-(newval>conf->session_val\|\|newval==0)&&`
	`2655`	`+conf->reset_val!=0&&`
	`2656`	`+(newval>conf->reset_val\|\|newval==0)&&`
`2657`	`2657`	`!superuser())`
`2658`	`2658`	`{`
`2659`	`2659`	`ereport(elevel,`
`@@ -2666,8 +2666,8 @@ set_config_option(const char name, const char value,`
`2666`	`2666`	`/* Allow admin to override non-superuser setting */`
`2667`	`2667`	`if (record->context==PGC_USERLIMIT&&`
`2668`	`2668`	`source<PGC_S_UNPRIVILEGED&&`
`2669`		`-record->session_source>PGC_S_UNPRIVILEGED&&`
`2670`		`-newval<conf->session_val&&`
	`2669`	`+record->reset_source>PGC_S_UNPRIVILEGED&&`
	`2670`	`+newval<conf->reset_val&&`
`2671`	`2671`	`!superuser())`
`2672`	`2672`	`changeVal=changeVal_orig;`
`2673`	`2673`	`}`
`@@ -2749,7 +2749,7 @@ set_config_option(const char name, const char value,`
`2749`	`2749`	`/* Limit non-superuser changes */`
`2750`	`2750`	`if (record->context==PGC_USERLIMIT&&`
`2751`	`2751`	`source>PGC_S_UNPRIVILEGED&&`
`2752`		`-newval>conf->session_val&&`
	`2752`	`+newval>conf->reset_val&&`
`2753`	`2753`	`!superuser())`
`2754`	`2754`	`{`
`2755`	`2755`	`ereport(elevel,`
`@@ -2762,8 +2762,8 @@ set_config_option(const char name, const char value,`
`2762`	`2762`	`/* Allow admin to override non-superuser setting */`
`2763`	`2763`	`if (record->context==PGC_USERLIMIT&&`
`2764`	`2764`	`source<PGC_S_UNPRIVILEGED&&`
`2765`		`-record->session_source>PGC_S_UNPRIVILEGED&&`
`2766`		`-newval<conf->session_val&&`
	`2765`	`+record->reset_source>PGC_S_UNPRIVILEGED&&`
	`2766`	`+newval<conf->reset_val&&`
`2767`	`2767`	`!superuser())`
`2768`	`2768`	`changeVal=changeVal_orig;`
`2769`	`2769`	`}`
`@@ -2860,8 +2860,8 @@ set_config_option(const char name, const char value,`
`2860`	`2860`	`}`
`2861`	`2861`	`/* Allow admin to override non-superuser setting */`
`2862`	`2862`	`if (source<PGC_S_UNPRIVILEGED&&`
`2863`		`-record->session_source>PGC_S_UNPRIVILEGED&&`
`2864`		`-newval<conf->session_val&&`
	`2863`	`+record->reset_source>PGC_S_UNPRIVILEGED&&`
	`2864`	`+newval<conf->reset_val&&`
`2865`	`2865`	`!superuser())`
`2866`	`2866`	`changeVal=changeVal_orig;`
`2867`	`2867`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6d239ee

File tree

1 file changed

1 file changed

`‎src/backend/utils/misc/guc.c‎`

0 commit comments