From e86507d7708591804c38de67f8ba5fdb67863810 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 3 Dec 2014 19:54:01 -0500
Subject: [PATCH] Move PG_AUTOCONF_FILENAME definition
Since this is not something that a user should change,
pg_config_manual.h was an inappropriate place for it.
In initdb.c, remove the use of the macro, because utils/guc.h can't be
included by non-backend code. But we hardcode all the other
configuration file names there, so this isn't a disaster.
---
src/bin/initdb/initdb.c | 2 +-
src/include/pg_config_manual.h | 7 -------
src/include/utils/guc.h | 7 +++++++
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 3bee6573afc..ed082409b72 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1366,7 +1366,7 @@ setup_config(void)
autoconflines[1] = pg_strdup("# It will be overwritten by the ALTER SYSTEM command.\n");
autoconflines[2] = NULL;
- sprintf(path, "%s/%s", pg_data, PG_AUTOCONF_FILENAME);
+ sprintf(path, "%s/postgresql.auto.conf", pg_data);
writefile(path, autoconflines);
if (chmod(path, S_IRUSR | S_IWUSR) != 0)
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index b82f0f70bda..38a2e9051f8 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -305,10 +305,3 @@
*/
/* #define HEAPDEBUGALL */
/* #define ACLDEBUG */
-
-/*
- * Automatic configuration file name for ALTER SYSTEM.
- * This file will be used to store values of configuration parameters
- * set by ALTER SYSTEM command.
- */
-#define PG_AUTOCONF_FILENAME "postgresql.auto.conf"
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 395858b1022..80813d23210 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -26,6 +26,13 @@
#define MAX_KILOBYTES (INT_MAX / 1024)
#endif
+/*
+ * Automatic configuration file name for ALTER SYSTEM.
+ * This file will be used to store values of configuration parameters
+ * set by ALTER SYSTEM command.
+ */
+#define PG_AUTOCONF_FILENAME "postgresql.auto.conf"
+
/*
* Certain options can only be set at certain times. The rules are
* like this:
--
GitLab