diff options
| author | Fujii Masao | 2014-06-19 11:31:20 +0000 |
|---|---|---|
| committer | Fujii Masao | 2014-06-19 11:31:20 +0000 |
| commit | 9ba78fb0b9e6c5a7115592c2c3116fca16b5184e (patch) | |
| tree | 81a218879d4679312afe557015fde851c4e77d55 /src/include | |
| parent | df8b7bc9ffff5b00aacff774600b569992cddeb8 (diff) | |
Don't allow data_directory to be set in postgresql.auto.conf by ALTER SYSTEM.
data_directory could be set both in postgresql.conf and postgresql.auto.conf so far.
This could cause some problematic situations like circular definition. To avoid such
situations, this commit forbids a user to set data_directory in postgresql.auto.conf.
Backpatch this to 9.4 where ALTER SYSTEM command was introduced.
Amit Kapila, reviewed by Abhijit Menon-Sen, with minor adjustments by me.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/utils/guc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index c15a5bbb7b..1493d2cb79 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -195,6 +195,7 @@ typedef enum #define GUC_UNIT_TIME 0x7000 /* mask for MS, S, MIN */ #define GUC_NOT_WHILE_SEC_REST 0x8000 /* can't set if security restricted */ +#define GUC_DISALLOW_IN_AUTO_FILE 0x00010000 /* can't set in PG_AUTOCONF_FILENAME */ /* GUC vars that are actually declared in guc.c, rather than elsewhere */ extern bool log_duration; |