diff options
| author | Fujii Masao <fujii@postgresql.org> | 2014-06-19 20:31:20 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2014-06-19 20:31:20 +0900 |
| commit | 9ba78fb0b9e6c5a7115592c2c3116fca16b5184e (patch) | |
| tree | 81a218879d4679312afe557015fde851c4e77d55 /src/backend/utils/misc/guc.c | |
| parent | df8b7bc9ffff5b00aacff774600b569992cddeb8 (diff) | |
| download | postgresql-9ba78fb0b9e6c5a7115592c2c3116fca16b5184e.tar.gz postgresql-9ba78fb0b9e6c5a7115592c2c3116fca16b5184e.zip | |
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/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 1d094f00c61..8ca065b7fee 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -3095,10 +3095,14 @@ static struct config_string ConfigureNamesString[] = }, { + /* + * Can't be set by ALTER SYSTEM as it can lead to recursive definition + * of data_directory. + */ {"data_directory", PGC_POSTMASTER, FILE_LOCATIONS, gettext_noop("Sets the server's data directory."), NULL, - GUC_SUPERUSER_ONLY + GUC_SUPERUSER_ONLY | GUC_DISALLOW_IN_AUTO_FILE }, &data_directory, NULL, @@ -6735,12 +6739,17 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt) (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("unrecognized configuration parameter \"%s\"", name))); + /* + * Don't allow the parameters which can't be set in configuration + * files to be set in PG_AUTOCONF_FILENAME file. + */ if ((record->context == PGC_INTERNAL) || - (record->flags & GUC_DISALLOW_IN_FILE)) - ereport(ERROR, - (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("parameter \"%s\" cannot be changed", - name))); + (record->flags & GUC_DISALLOW_IN_FILE) || + (record->flags & GUC_DISALLOW_IN_AUTO_FILE)) + ereport(ERROR, + (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), + errmsg("parameter \"%s\" cannot be changed", + name))); if (!validate_conf_option(record, name, value, PGC_S_FILE, ERROR, true, NULL, |