|
|
@ -12,37 +12,34 @@ server package update, without requiring any existing postgresql.conf |
|
|
|
to be updated. (Of course, a user who dislikes this behavior can still |
|
|
|
to be updated. (Of course, a user who dislikes this behavior can still |
|
|
|
override it via postgresql.conf.) |
|
|
|
override it via postgresql.conf.) |
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c |
|
|
|
diff -ur -x 'cscope*' postgresql-16beta1/src/backend/utils/misc/guc_tables.c postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c |
|
|
|
index 9481f2d..75532c7 100644 |
|
|
|
--- postgresql-16beta1/src/backend/utils/misc/guc_tables.c 2023-05-22 23:08:08.000000000 +0200 |
|
|
|
--- a/src/backend/utils/misc/guc.c |
|
|
|
+++ postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c 2023-06-01 09:39:24.000000000 +0200 |
|
|
|
+++ b/src/backend/utils/misc/guc.c |
|
|
|
@@ -4300,7 +4300,7 @@ |
|
|
|
@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] = |
|
|
|
GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY |
|
|
|
}, |
|
|
|
}, |
|
|
|
&Unix_socket_directories, |
|
|
|
&Unix_socket_directories, |
|
|
|
#ifdef HAVE_UNIX_SOCKETS |
|
|
|
|
|
|
|
- DEFAULT_PGSOCKET_DIR, |
|
|
|
- DEFAULT_PGSOCKET_DIR, |
|
|
|
+ DEFAULT_PGSOCKET_DIR ", /tmp", |
|
|
|
+ DEFAULT_PGSOCKET_DIR ", /tmp", |
|
|
|
#else |
|
|
|
NULL, NULL, NULL |
|
|
|
"", |
|
|
|
}, |
|
|
|
#endif |
|
|
|
|
|
|
|
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c |
|
|
|
|
|
|
|
index feeff9e..3e3d784 100644 |
|
|
|
|
|
|
|
--- a/src/bin/initdb/initdb.c |
|
|
|
|
|
|
|
+++ b/src/bin/initdb/initdb.c |
|
|
|
|
|
|
|
@@ -1234,7 +1234,7 @@ setup_config(void) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_UNIX_SOCKETS |
|
|
|
diff -ur -x 'cscope*' postgresql-16beta1/src/bin/initdb/initdb.c postgresql16_socket_patch/src/bin/initdb/initdb.c |
|
|
|
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'", |
|
|
|
--- postgresql-16beta1/src/bin/initdb/initdb.c 2023-05-22 23:08:08.000000000 +0200 |
|
|
|
- DEFAULT_PGSOCKET_DIR); |
|
|
|
+++ postgresql16_socket_patch/src/bin/initdb/initdb.c 2023-06-01 09:42:16.000000000 +0200 |
|
|
|
+ DEFAULT_PGSOCKET_DIR ", /tmp"); |
|
|
|
@@ -1291,7 +1291,7 @@ |
|
|
|
#else |
|
|
|
* these are indeed defaults, keep the postgresql.conf lines commented. |
|
|
|
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''"); |
|
|
|
*/ |
|
|
|
#endif |
|
|
|
conflines = replace_guc_value(conflines, "unix_socket_directories", |
|
|
|
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h |
|
|
|
- DEFAULT_PGSOCKET_DIR, true); |
|
|
|
index e278fa0..9ee15d4 100644 |
|
|
|
+ DEFAULT_PGSOCKET_DIR ", /tmp", true); |
|
|
|
--- a/src/include/pg_config_manual.h |
|
|
|
|
|
|
|
+++ b/src/include/pg_config_manual.h |
|
|
|
conflines = replace_guc_value(conflines, "port", |
|
|
|
@@ -201,7 +201,7 @@ |
|
|
|
DEF_PGPORT_STR, true); |
|
|
|
|
|
|
|
diff -ur -x 'cscope*' postgresql-16beta1/src/include/pg_config_manual.h postgresql16_socket_patch/src/include/pg_config_manual.h |
|
|
|
|
|
|
|
--- postgresql-16beta1/src/include/pg_config_manual.h 2023-05-22 23:08:08.000000000 +0200 |
|
|
|
|
|
|
|
+++ postgresql16_socket_patch/src/include/pg_config_manual.h 2023-06-01 09:43:19.000000000 +0200 |
|
|
|
|
|
|
|
@@ -206,7 +206,7 @@ |
|
|
|
* support them yet. |
|
|
|
* support them yet. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
#ifndef WIN32 |
|
|
|
#ifndef WIN32 |
|
|
|