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.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 5036d01b6086426512d4fbcffbea29ffd8d897d0..874775577a4ff992970af19190a8e35024b0f07c 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1359,7 +1359,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 ba17c4d1f255b964335ebcae73a6dff3ff29d098..311d7cb379f3fc0446db571e0fc9e18e1186bd9b 100644 (file)
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -300,10 +300,3 @@
 /* #define HEAPDEBUGALL */
 /* #define ACLDEBUG */
 /* #define RTDEBUG */
-
-/*
- * 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 1493d2cb79cbcde4fccf29a02efa2523d938a52a..ed6515a07e538c169393edae4a95558e80047bf5 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -18,6 +18,13 @@
 #include "utils/array.h"
 
 
+/*
+ * 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: