summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2023-11-25 15:04:07 +0100
committerJulien Nabet <serval2412@yahoo.fr>2024-04-22 19:56:48 +0200
commit53ab6269215d4e37af3f9dfaae2a306e040c5b88 (patch)
tree791ac9b396455c5fe2c4d4cbda8bd03f7d60a537 /external
parent851f60697d32849454528e5f14ed80446b330e0c (diff)
tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapi
Exclude Windows since we're not sure gssapi.h is available (at least Jenkins Windows machine doesn't have it) Change-Id: Iba396f77b07dce4291de5eb0e6ad7c0c25e6c3c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159954 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'external')
-rw-r--r--external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk9
-rw-r--r--external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk6
2 files changed, 15 insertions, 0 deletions
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b8802e16695e..a5b485b74d13 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -53,6 +53,11 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
+ $(ifneq $(filter $(OS),WNT), \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
+ ) \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
@@ -65,6 +70,10 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
+ $(ifneq $(filter $(OS),WNT), \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
+ ) \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 241e12db6581..f874918de5ee 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,6 +36,9 @@ $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin mysql_native_password_client_plugin\; \
+ $(ifneq $(filter WNT,$(OS)), \
+ extern struct st_mysql_client_plugin_AUTHENTICATION auth_gssapi_client_client_plugin\; \
+ ) \
$(if $(filter WNT,$(OS)), \
extern struct st_mysql_client_plugin pvio_shmem_client_plugin\; \
extern struct st_mysql_client_plugin pvio_npipe_client_plugin\; \
@@ -45,6 +48,9 @@ $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
(struct st_mysql_client_plugin *)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin *)\&caching_sha2_password_client_plugin$(COMMA) \
(struct st_mysql_client_plugin *)\&mysql_native_password_client_plugin$(COMMA) \
+ $(ifneq $(filter WNT,$(OS)), \
+ (struct st_mysql_client_plugin_AUTHENTICATION *)\&auth_gssapi_client_client_plugin$(COMMA) \
+ ) \
$(if $(filter WNT,$(OS)), \
(struct st_mysql_client_plugin *)\&pvio_shmem_client_plugin$(COMMA) \
(struct st_mysql_client_plugin *)\&pvio_npipe_client_plugin$(COMMA) \