|
10 | 10 | * Written by Peter Eisentraut <peter_e@gmx.net>. |
11 | 11 | * |
12 | 12 | * IDENTIFICATION |
13 | | - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.193 2004/03/24 22:40:29 tgl Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.194 2004/04/01 14:25:47 momjian Exp $ |
14 | 14 | * |
15 | 15 | *-------------------------------------------------------------------- |
16 | 16 | */ |
@@ -2739,7 +2739,7 @@ set_config_option(const char *name, const char *value, |
2739 | 2739 | errhint("Must be superuser to change this value to false."))); |
2740 | 2740 | return false; |
2741 | 2741 | } |
2742 | | - /* Allow admin to override non-superuser setting */ |
| 2742 | + /* Honor change to config file with SIGHUP */ |
2743 | 2743 | if (record->context == PGC_USERLIMIT && |
2744 | 2744 | source < PGC_S_UNPRIVILEGED && |
2745 | 2745 | record->reset_source > PGC_S_UNPRIVILEGED && |
@@ -2836,11 +2836,11 @@ set_config_option(const char *name, const char *value, |
2836 | 2836 | errhint("Must be superuser to increase this value or set it to zero."))); |
2837 | 2837 | return false; |
2838 | 2838 | } |
2839 | | - /* Allow admin to override non-superuser setting */ |
| 2839 | + /* Honor change to config file with SIGHUP */ |
2840 | 2840 | if (record->context == PGC_USERLIMIT && |
2841 | 2841 | source < PGC_S_UNPRIVILEGED && |
2842 | 2842 | record->reset_source > PGC_S_UNPRIVILEGED && |
2843 | | - newval < conf->reset_val && |
| 2843 | + newval < conf->reset_val && newval != 0 && |
2844 | 2844 | !superuser()) |
2845 | 2845 | changeVal = changeVal_orig; |
2846 | 2846 | } |
@@ -2932,7 +2932,7 @@ set_config_option(const char *name, const char *value, |
2932 | 2932 | errhint("Must be superuser to increase this value."))); |
2933 | 2933 | return false; |
2934 | 2934 | } |
2935 | | - /* Allow admin to override non-superuser setting */ |
| 2935 | + /* Honor change to config file with SIGHUP */ |
2936 | 2936 | if (record->context == PGC_USERLIMIT && |
2937 | 2937 | source < PGC_S_UNPRIVILEGED && |
2938 | 2938 | record->reset_source > PGC_S_UNPRIVILEGED && |
@@ -3031,7 +3031,7 @@ set_config_option(const char *name, const char *value, |
3031 | 3031 | errhint("Must be superuser to increase this value."))); |
3032 | 3032 | return false; |
3033 | 3033 | } |
3034 | | - /* Allow admin to override non-superuser setting */ |
| 3034 | + /* Honor change to config file with SIGHUP */ |
3035 | 3035 | if (source < PGC_S_UNPRIVILEGED && |
3036 | 3036 | record->reset_source > PGC_S_UNPRIVILEGED && |
3037 | 3037 | newval < conf->reset_val && |
|
0 commit comments