summaryrefslogtreecommitdiff
path: root/databases/postgresql-plproxy/files/patch-src-cluster.c
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2019-08-16 18:09:24 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2019-08-16 18:09:24 +0000
commit9a656772b7d07952779caa5985e92952c305b4cb (patch)
tree8a15337007bb9ae23fd919903d993068360d231f /databases/postgresql-plproxy/files/patch-src-cluster.c
parentUpdate to 1.6.2 (diff)
Fix build with PostgreSQL 10 and 11
Notes
Notes: svn path=/head/; revision=509088
Diffstat (limited to 'databases/postgresql-plproxy/files/patch-src-cluster.c')
-rw-r--r--databases/postgresql-plproxy/files/patch-src-cluster.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/databases/postgresql-plproxy/files/patch-src-cluster.c b/databases/postgresql-plproxy/files/patch-src-cluster.c
new file mode 100644
index 000000000000..744f38cbfde6
--- /dev/null
+++ b/databases/postgresql-plproxy/files/patch-src-cluster.c
@@ -0,0 +1,26 @@
+--- src/cluster.c.orig 2017-10-08 08:53:35 UTC
++++ src/cluster.c
+@@ -588,7 +588,11 @@ reload_sqlmed_user(ProxyFunction *func,
+ */
+ aclresult = pg_foreign_server_aclcheck(um->serverid, um->userid, ACL_USAGE);
+ if (aclresult != ACLCHECK_OK)
++#if PG_VERSION_NUM >= 110000
++ aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, cluster->name);
++#else
+ aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, cluster->name);
++#endif
+
+ /* Extract the common connect string elements from user mapping */
+ got_user = false;
+@@ -657,7 +661,11 @@ reload_sqlmed_cluster(ProxyFunction *fun
+ */
+ aclresult = pg_foreign_server_aclcheck(foreign_server->serverid, info->user_oid, ACL_USAGE);
+ if (aclresult != ACLCHECK_OK)
++#if PG_VERSION_NUM >= 110000
++ aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, foreign_server->servername);
++#else
+ aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, foreign_server->servername);
++#endif
+
+ /* drop old config values */
+ clear_config(&cluster->config);