diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-07-01 14:06:40 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-07-01 14:08:56 +0200 |
| commit | 8bfe83628b5135492fc8731a86b84887b2f7c904 (patch) | |
| tree | 3776e3195480c729d9d9090a62c24f2d111a8ba6 | |
| parent | d8421390996dcd762383a28e57d1f3f16cc5f76f (diff) | |
| download | postgresql-8bfe83628b5135492fc8731a86b84887b2f7c904.tar.gz postgresql-8bfe83628b5135492fc8731a86b84887b2f7c904.zip | |
Fix libpq example programs
When these programs call pg_catalog.set_config, they need to check for
PGRES_TUPLES_OK instead of PGRES_COMMAND_OK. Fix for
5770172cb0c9df9e6ce27c507b449557e5b45124.
Reported-by: Ideriha, Takeshi <ideriha.takeshi@jp.fujitsu.com>
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 4 | ||||
| -rw-r--r-- | doc/src/sgml/lobj.sgml | 2 | ||||
| -rw-r--r-- | src/test/examples/testlibpq.c | 2 | ||||
| -rw-r--r-- | src/test/examples/testlibpq2.c | 2 | ||||
| -rw-r--r-- | src/test/examples/testlibpq4.c | 2 | ||||
| -rw-r--r-- | src/test/examples/testlo.c | 2 | ||||
| -rw-r--r-- | src/test/examples/testlo64.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 515bcb67794..d67212b8311 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -8440,7 +8440,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); @@ -8610,7 +8610,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 771795ae668..f56aeebddb2 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -936,7 +936,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c index 92a05e53093..d9c6c4587d4 100644 --- a/src/test/examples/testlibpq.c +++ b/src/test/examples/testlibpq.c @@ -51,7 +51,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c index 76787fe010b..62ecd68b55e 100644 --- a/src/test/examples/testlibpq2.c +++ b/src/test/examples/testlibpq2.c @@ -80,7 +80,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c index a20f6249b4e..6fcbdda2fa7 100644 --- a/src/test/examples/testlibpq4.c +++ b/src/test/examples/testlibpq4.c @@ -37,7 +37,7 @@ check_prepare_conn(PGconn *conn, const char *dbName) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c index be5c72b9a67..8d8fb494f97 100644 --- a/src/test/examples/testlo.c +++ b/src/test/examples/testlo.c @@ -235,7 +235,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlo64.c b/src/test/examples/testlo64.c index 39ba009c523..85da06a640e 100644 --- a/src/test/examples/testlo64.c +++ b/src/test/examples/testlo64.c @@ -259,7 +259,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); |