diff options
| -rw-r--r-- | contrib/adminpack/adminpack.c | 2 | ||||
| -rw-r--r-- | contrib/adminpack/expected/adminpack.out | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/genfile.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c index 357b671a6c6..d3aec7b685b 100644 --- a/contrib/adminpack/adminpack.c +++ b/contrib/adminpack/adminpack.c @@ -97,7 +97,7 @@ convert_and_check_filename(text *arg) else if (!path_is_relative_and_below_cwd(filename)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("path must be in or below the current directory"))); + errmsg("path must be in or below the data directory"))); return filename; } diff --git a/contrib/adminpack/expected/adminpack.out b/contrib/adminpack/expected/adminpack.out index 6bcf2217f25..f419a5ea1df 100644 --- a/contrib/adminpack/expected/adminpack.out +++ b/contrib/adminpack/expected/adminpack.out @@ -41,7 +41,7 @@ GRANT pg_read_all_settings TO regress_adminpack_user1; GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_adminpack_user1; SET ROLE regress_adminpack_user1; SELECT pg_file_write('../test_file0', 'test0', false); -ERROR: path must be in or below the current directory +ERROR: path must be in or below the data directory SELECT pg_file_write('/tmp/test_file0', 'test0', false); ERROR: absolute path not allowed SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4', false); diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 75588eebb34..f281ce98068 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -86,7 +86,7 @@ convert_and_check_filename(text *arg) else if (!path_is_relative_and_below_cwd(filename)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("path must be in or below the current directory"))); + errmsg("path must be in or below the data directory"))); return filename; } |