rpms/postgresql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow embedded whitespace in unix_socket_directories items.

Browse Source
This commit is contained in:
Tom Lane 2012-09-06 12:01:42 -04:00
parent 8f944a5a01
commit bd43a1efcc
1 changed files with 102 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
postgresql-multi-sockets.patch
View File

@ -1,6 +1,7 @@
Back-port of upstream 9.3 patch to support multiple sockets Back-port of upstream 9.3 patch to support multiple sockets
(upstream git commit c9b0cbe98bd783e24a8c4d8d8ac472a494b81292, (upstream git commits c9b0cbe98bd783e24a8c4d8d8ac472a494b81292 and
plus updates of derived documentation files). d2286a98ef3fb88bafb57381b4c20b8b878827f1, plus updates of derived
documentation files).
Note the patch also touches html-stamp and man-stamp in doc/src/sgml/; Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
this is to keep the makefiles from trying to rebuild the derived doc this is to keep the makefiles from trying to rebuild the derived doc
@ -8,9 +9,9 @@ files. We don't want that to happen because the BuildRequires for the
package don't include the necessary documentation tools. package don't include the necessary documentation tools.
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.4/doc/src/sgml/client-auth.sgml diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/doc/src/sgml/client-auth.sgml
--- postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/client-auth.sgml 2012-08-12 19:31:41.479999838 -0400 +++ postgresql-9.1.5/doc/src/sgml/client-auth.sgml 2012-09-06 11:53:55.188679276 -0400
@@ -831,7 +831,7 @@ @@ -831,7 +831,7 @@
<varname>unix_socket_permissions</varname> (and possibly <varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as <varname>unix_socket_group</varname>) configuration parameters as
@ -20,9 +21,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.4/
configuration parameter to place the socket file in a suitably configuration parameter to place the socket file in a suitably
restricted directory. restricted directory.
</para> </para>
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/src/sgml/config.sgml diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/src/sgml/config.sgml
--- postgresql-9.1.4.orig/doc/src/sgml/config.sgml 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/config.sgml 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/config.sgml 2012-08-12 19:31:41.481999903 -0400 +++ postgresql-9.1.5/doc/src/sgml/config.sgml 2012-09-06 11:53:55.200679690 -0400
@@ -417,17 +417,24 @@ @@ -417,17 +417,24 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -86,7 +87,7 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/s
sockets use the usual Unix file system permission set. sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode The parameter value is expected to be a numeric mode
specified in the format accepted by the specified in the format accepted by the
@@ -6413,7 +6420,7 @@ @@ -6417,7 +6424,7 @@
</row> </row>
<row> <row>
<entry><option>-k <replaceable>x</replaceable></option></entry> <entry><option>-k <replaceable>x</replaceable></option></entry>
@ -95,9 +96,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/s
</row> </row>
<row> <row>
<entry><option>-l</option></entry> <entry><option>-l</option></entry>
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.4/doc/src/sgml/html/app-postgres.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.5/doc/src/sgml/html/app-postgres.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html 2012-05-31 19:23:13.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html 2012-08-14 18:56:14.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/app-postgres.html 2012-08-12 19:32:55.022709775 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/app-postgres.html 2012-09-06 11:53:55.201679728 -0400
@@ -531,11 +531,19 @@ @@ -531,11 +531,19 @@
CLASS="COMMAND" CLASS="COMMAND"
>postgres</TT >postgres</TT
@ -120,9 +121,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P </P
></DD ></DD
><DT ><DT
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.4/doc/src/sgml/html/auth-methods.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.5/doc/src/sgml/html/auth-methods.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html 2012-05-31 19:22:57.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html 2012-08-14 18:55:57.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/auth-methods.html 2012-08-12 19:32:37.316538936 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/auth-methods.html 2012-09-06 11:53:55.201679728 -0400
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
>. Or you >. Or you
could set the <TT could set the <TT
@ -132,9 +133,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html postgresql-
> >
configuration parameter to place the socket file in a suitably configuration parameter to place the socket file in a suitably
restricted directory. restricted directory.
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.4/doc/src/sgml/html/bookindex.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.5/doc/src/sgml/html/bookindex.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html 2012-05-31 19:23:47.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html 2012-08-14 18:56:48.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/bookindex.html 2012-08-12 19:33:28.487032655 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/bookindex.html 2012-09-06 11:53:55.204679820 -0400
@@ -16893,7 +16893,7 @@ @@ -16893,7 +16893,7 @@
></DL ></DL
></DD ></DD
@ -144,9 +145,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html postgresql-9.1
<A <A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS" HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A >Connection Settings</A
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-05-31 19:22:56.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-14 18:55:56.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-12 19:32:36.060526818 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 11:53:55.205679845 -0400
@@ -115,8 +115,8 @@ @@ -115,8 +115,8 @@
>local</TT >local</TT
> >
@ -158,9 +159,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only >) that has write permission only
for a trusted local user. This prevents a malicious user from creating for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that their own socket file in that directory. If you are concerned that
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html 2012-05-31 19:22:56.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html 2012-08-14 18:55:56.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html 2012-08-12 19:32:36.376529867 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 11:53:55.205679845 -0400
@@ -274,24 +274,31 @@ @@ -274,24 +274,31 @@
></DD ></DD
><DT ><DT
@ -235,9 +236,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set. sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode The parameter value is expected to be a numeric mode
specified in the format accepted by the specified in the format accepted by the
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html
--- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html 2012-05-31 19:22:57.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html 2012-08-14 18:55:57.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html 2012-08-12 19:32:37.044536313 -0400 +++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html 2012-09-06 11:53:55.206679864 -0400
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
><TD ><TD
><TT ><TT
@ -247,9 +248,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE" CLASS="REPLACEABLE"
><I ><I
>x</I >x</I
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.4/doc/src/sgml/man1/postgres.1 diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/doc/src/sgml/man1/postgres.1
--- postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 2012-05-31 19:24:40.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 2012-08-14 18:57:43.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/man1/postgres.1 2012-08-12 19:34:17.019500922 -0400 +++ postgresql-9.1.5/doc/src/sgml/man1/postgres.1 2012-09-06 11:53:55.206679864 -0400
@@ -180,8 +180,10 @@ @@ -180,8 +180,10 @@
.RS 4 .RS 4
Specifies the directory of the Unix\-domain socket on which Specifies the directory of the Unix\-domain socket on which
@ -263,9 +264,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.4/d
.RE .RE
.PP .PP
\fB\-l\fR \fB\-l\fR
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml
--- postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml 2012-08-12 19:31:41.481999903 -0400 +++ postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 11:53:55.207679890 -0400
@@ -233,8 +233,14 @@ @@ -233,8 +233,14 @@
<para> <para>
Specifies the directory of the Unix-domain socket on which Specifies the directory of the Unix-domain socket on which
@ -283,9 +284,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml postgresql-9.1.4/doc/src/sgml/runtime.sgml diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/src/sgml/runtime.sgml
--- postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/runtime.sgml 2012-08-12 19:31:41.482999933 -0400 +++ postgresql-9.1.5/doc/src/sgml/runtime.sgml 2012-09-06 11:53:55.208679918 -0400
@@ -1816,7 +1816,7 @@ @@ -1816,7 +1816,7 @@
<para> <para>
The simplest way to prevent spoofing for <literal>local</> The simplest way to prevent spoofing for <literal>local</>
@ -295,9 +296,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml postgresql-9.1.4/doc/
for a trusted local user. This prevents a malicious user from creating for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the some applications might still reference <filename>/tmp</> for the
diff -Naur postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c postgresql-9.1.4/src/backend/libpq/pqcomm.c diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src/backend/libpq/pqcomm.c
--- postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/libpq/pqcomm.c 2012-08-12 19:31:41.483999957 -0400 +++ postgresql-9.1.5/src/backend/libpq/pqcomm.c 2012-09-06 11:53:55.209679942 -0400
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port * StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client * StreamConnection - Create new connection with client
@ -507,9 +508,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c postgresql-9.1.4/src
/* /*
* utime() is POSIX standard, utimes() is a common alternative. If we * utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of * have neither, there's no way to affect the mod or access time of
diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-9.1.4/src/backend/postmaster/postmaster.c diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-9.1.5/src/backend/postmaster/postmaster.c
--- postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/postmaster/postmaster.c 2012-08-12 19:31:41.486000046 -0400 +++ postgresql-9.1.5/src/backend/postmaster/postmaster.c 2012-09-06 11:53:55.210679959 -0400
@@ -157,7 +157,9 @@ @@ -157,7 +157,9 @@
/* The socket number we are listening for connections on */ /* The socket number we are listening for connections on */
@ -521,7 +522,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
char *ListenAddresses; char *ListenAddresses;
/* /*
@@ -589,7 +591,7 @@ @@ -590,7 +592,7 @@
break; break;
case 'k': case 'k':
@ -530,7 +531,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
break; break;
case 'l': case 'l':
@@ -842,7 +844,7 @@ @@ -848,7 +850,7 @@
/* Need a modifiable copy of ListenAddresses */ /* Need a modifiable copy of ListenAddresses */
rawstring = pstrdup(ListenAddresses); rawstring = pstrdup(ListenAddresses);
@ -539,7 +540,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
if (!SplitIdentifierString(rawstring, ',', &elemlist)) if (!SplitIdentifierString(rawstring, ',', &elemlist))
{ {
/* syntax error in list */ /* syntax error in list */
@@ -858,12 +860,12 @@ @@ -864,12 +866,12 @@
if (strcmp(curhost, "*") == 0) if (strcmp(curhost, "*") == 0)
status = StreamServerPort(AF_UNSPEC, NULL, status = StreamServerPort(AF_UNSPEC, NULL,
(unsigned short) PostPortNumber, (unsigned short) PostPortNumber,
@ -554,7 +555,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
ListenSocket, MAXLISTEN); ListenSocket, MAXLISTEN);
if (status == STATUS_OK) if (status == STATUS_OK)
@@ -882,7 +884,7 @@ @@ -888,7 +890,7 @@
curhost))); curhost)));
} }
@ -563,7 +564,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
ereport(FATAL, ereport(FATAL,
(errmsg("could not create any TCP/IP sockets"))); (errmsg("could not create any TCP/IP sockets")));
@@ -929,13 +931,54 @@ @@ -935,13 +937,54 @@
#endif #endif
#ifdef HAVE_UNIX_SOCKETS #ifdef HAVE_UNIX_SOCKETS
@ -625,7 +626,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
#endif #endif
/* /*
@@ -1523,15 +1566,15 @@ @@ -1529,15 +1572,15 @@
} }
/* /*
@ -644,9 +645,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now; last_touch_time = now;
} }
} }
diff -Naur postgresql-9.1.4.orig/src/backend/tcop/postgres.c postgresql-9.1.4/src/backend/tcop/postgres.c diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/src/backend/tcop/postgres.c
--- postgresql-9.1.4.orig/src/backend/tcop/postgres.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/tcop/postgres.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/tcop/postgres.c 2012-08-12 19:31:41.487000086 -0400 +++ postgresql-9.1.5/src/backend/tcop/postgres.c 2012-09-06 11:53:55.211679977 -0400
@@ -3345,7 +3345,7 @@ @@ -3345,7 +3345,7 @@
break; break;
@ -656,10 +657,10 @@ diff -Naur postgresql-9.1.4.orig/src/backend/tcop/postgres.c postgresql-9.1.4/sr
break; break;
case 'l': case 'l':
diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.4/src/backend/utils/adt/varlena.c diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.5/src/backend/utils/adt/varlena.c
--- postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/utils/adt/varlena.c 2012-08-12 19:31:41.489000154 -0400 +++ postgresql-9.1.5/src/backend/utils/adt/varlena.c 2012-09-06 11:54:14.148859548 -0400
@@ -2387,6 +2387,116 @@ @@ -2387,6 +2387,119 @@
} }
@ -668,9 +669,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
+ * + *
+ * This is similar to SplitIdentifierString, except that the parsing + * This is similar to SplitIdentifierString, except that the parsing
+ * rules are meant to handle pathnames instead of identifiers: there is + * rules are meant to handle pathnames instead of identifiers: there is
+ * no downcasing, the max length is MAXPGPATH-1, and we apply + * no downcasing, embedded spaces are allowed, the max length is MAXPGPATH-1,
+ * canonicalize_path() to each extracted string. Because of the last, + * and we apply canonicalize_path() to each extracted string. Because of the
+ * the returned strings are separately palloc'd rather than being + * last, the returned strings are separately palloc'd rather than being
+ * pointers into rawstring --- but we still scribble on rawstring. + * pointers into rawstring --- but we still scribble on rawstring.
+ * + *
+ * Inputs: + * Inputs:
@ -727,13 +728,16 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
+ } + }
+ else + else
+ { + {
+ /* Unquoted name --- extends to separator or whitespace */ + /* Unquoted name --- extends to separator or end of string */
+ curname = nextp; + curname = endp = nextp;
+ while (*nextp && *nextp != separator && + while (*nextp && *nextp != separator)
+ !isspace((unsigned char) *nextp)) + {
+ /* trailing whitespace should not be included in name */
+ if (!isspace((unsigned char) *nextp))
+ endp = nextp + 1;
+ nextp++; + nextp++;
+ endp = nextp; + }
+ if (curname == nextp) + if (curname == endp)
+ return false; /* empty unquoted name not allowed */ + return false; /* empty unquoted name not allowed */
+ } + }
+ +
@ -776,9 +780,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
/***************************************************************************** /*****************************************************************************
* Comparison Functions used for bytea * Comparison Functions used for bytea
* *
diff -Naur postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c postgresql-9.1.4/src/backend/utils/init/miscinit.c diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.1.5/src/backend/utils/init/miscinit.c
--- postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/utils/init/miscinit.c 2012-08-12 19:31:41.489000154 -0400 +++ postgresql-9.1.5/src/backend/utils/init/miscinit.c 2012-09-06 11:53:55.213680015 -0400
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing; ProcessingMode Mode = InitProcessing;
@ -1023,9 +1027,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c postgresql-9.
{ {
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/src/backend/utils/misc/guc.c
--- postgresql-9.1.4.orig/src/backend/utils/misc/guc.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/utils/misc/guc.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 19:31:41.491000208 -0400 +++ postgresql-9.1.5/src/backend/utils/misc/guc.c 2012-09-06 11:53:55.215680028 -0400
@@ -2867,14 +2867,18 @@ @@ -2867,14 +2867,18 @@
}, },
@ -1049,9 +1053,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/guc.c postgresql-9.1.4/s
}, },
{ {
diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample 2012-08-12 19:31:41.492000232 -0400 +++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 11:53:55.216680035 -0400
@@ -65,7 +65,8 @@ @@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per # Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction). # connection slot, plus lock space (see max_locks_per_transaction).
@ -1062,9 +1066,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart) #unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation #unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart) # (change requires restart)
diff -Naur postgresql-9.1.4.orig/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bin/initdb/initdb.c
--- postgresql-9.1.4.orig/src/bin/initdb/initdb.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/bin/initdb/initdb.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 19:31:41.493000252 -0400 +++ postgresql-9.1.5/src/bin/initdb/initdb.c 2012-09-06 11:53:55.217680041 -0400
@@ -947,7 +947,7 @@ @@ -947,7 +947,7 @@
setup_config(void) setup_config(void)
{ {
@ -1090,9 +1094,9 @@ diff -Naur postgresql-9.1.4.orig/src/bin/initdb/initdb.c postgresql-9.1.4/src/bi
#if DEF_PGPORT != 5432 #if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT); snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok); conflines = replace_token(conflines, "#port = 5432", repltok);
diff -Naur postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c
--- postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c 2012-08-12 19:31:41.494000277 -0400 +++ postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c 2012-09-06 11:53:55.218680049 -0400
@@ -519,7 +519,7 @@ @@ -519,7 +519,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1]; hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
@ -1102,9 +1106,9 @@ diff -Naur postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.4/src/bi
* directories, libpq's host parameter must have a * directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So, * leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP * ignore sockdir if it's relative, and try to use TCP
diff -Naur postgresql-9.1.4.orig/src/include/libpq/libpq.h postgresql-9.1.4/src/include/libpq/libpq.h diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/include/libpq/libpq.h
--- postgresql-9.1.4.orig/src/include/libpq/libpq.h 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/include/libpq/libpq.h 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/include/libpq/libpq.h 2012-08-12 19:31:41.494000277 -0400 +++ postgresql-9.1.5/src/include/libpq/libpq.h 2012-09-06 11:53:55.218680049 -0400
@@ -44,12 +44,12 @@ @@ -44,12 +44,12 @@
/* /*
* prototypes for functions in pqcomm.c * prototypes for functions in pqcomm.c
@ -1122,9 +1126,9 @@ diff -Naur postgresql-9.1.4.orig/src/include/libpq/libpq.h postgresql-9.1.4/src/
extern void pq_init(void); extern void pq_init(void);
extern void pq_comm_reset(void); extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len); extern int pq_getbytes(char *s, size_t len);
diff -Naur postgresql-9.1.4.orig/src/include/miscadmin.h postgresql-9.1.4/src/include/miscadmin.h diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/include/miscadmin.h
--- postgresql-9.1.4.orig/src/include/miscadmin.h 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/include/miscadmin.h 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/include/miscadmin.h 2012-08-12 19:31:41.495000302 -0400 +++ postgresql-9.1.5/src/include/miscadmin.h 2012-09-06 11:53:55.219680061 -0400
@@ -370,7 +370,7 @@ @@ -370,7 +370,7 @@
* 2 data directory path * 2 data directory path
* 3 postmaster start timestamp (time_t representation) * 3 postmaster start timestamp (time_t representation)
@ -1146,9 +1150,9 @@ diff -Naur postgresql-9.1.4.orig/src/include/miscadmin.h postgresql-9.1.4/src/in
extern void AddToDataDirLockFile(int target_line, const char *str); extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path); extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void); extern void process_shared_preload_libraries(void);
diff -Naur postgresql-9.1.4.orig/src/include/postmaster/postmaster.h postgresql-9.1.4/src/include/postmaster/postmaster.h diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-9.1.5/src/include/postmaster/postmaster.h
--- postgresql-9.1.4.orig/src/include/postmaster/postmaster.h 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/include/postmaster/postmaster.h 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/include/postmaster/postmaster.h 2012-08-12 19:31:41.495000302 -0400 +++ postgresql-9.1.5/src/include/postmaster/postmaster.h 2012-09-06 11:53:55.219680061 -0400
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
extern int PostPortNumber; extern int PostPortNumber;
extern int Unix_socket_permissions; extern int Unix_socket_permissions;
@ -1158,10 +1162,10 @@ diff -Naur postgresql-9.1.4.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses; extern char *ListenAddresses;
extern bool ClientAuthInProgress; extern bool ClientAuthInProgress;
extern int PreAuthDelay; extern int PreAuthDelay;
diff -Naur postgresql-9.1.4.orig/src/include/utils/builtins.h postgresql-9.1.4/src/include/utils/builtins.h diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/src/include/utils/builtins.h
--- postgresql-9.1.4.orig/src/include/utils/builtins.h 2012-05-31 19:07:09.000000000 -0400 --- postgresql-9.1.5.orig/src/include/utils/builtins.h 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.4/src/include/utils/builtins.h 2012-08-12 19:31:41.496000323 -0400 +++ postgresql-9.1.5/src/include/utils/builtins.h 2012-09-06 11:53:55.220680072 -0400
@@ -726,6 +726,8 @@ @@ -728,6 +728,8 @@
extern List *textToQualifiedNameList(text *textval); extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator, extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist); List **namelist);
@ -1170,13 +1174,13 @@ diff -Naur postgresql-9.1.4.orig/src/include/utils/builtins.h postgresql-9.1.4/s
extern Datum replace_text(PG_FUNCTION_ARGS); extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp, extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob); text *replace_text, bool glob);
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html-stamp postgresql-9.1.4/doc/src/sgml/html-stamp diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html-stamp postgresql-9.1.5/doc/src/sgml/html-stamp
--- postgresql-9.1.4.orig/doc/src/sgml/html-stamp 2012-05-31 19:23:47.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/html-stamp 2012-08-14 18:56:48.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/html-stamp 2012-08-12 19:50:30.401879619 -0400 +++ postgresql-9.1.5/doc/src/sgml/html-stamp 2012-09-06 11:53:55.220680072 -0400
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+hack +hack
diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man-stamp postgresql-9.1.4/doc/src/sgml/man-stamp diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man-stamp postgresql-9.1.5/doc/src/sgml/man-stamp
--- postgresql-9.1.4.orig/doc/src/sgml/man-stamp 2012-05-31 19:24:44.000000000 -0400 --- postgresql-9.1.5.orig/doc/src/sgml/man-stamp 2012-08-14 18:57:47.000000000 -0400
+++ postgresql-9.1.4/doc/src/sgml/man-stamp 2012-08-12 19:50:36.017933728 -0400 +++ postgresql-9.1.5/doc/src/sgml/man-stamp 2012-09-06 11:53:55.220680072 -0400
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+hack +hack