diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-12-01 19:58:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-02 21:12:35 +0100 |
| commit | 9ac5e72d01b3d95596b7c6aa8e701514c69b6f88 (patch) | |
| tree | 793c6ef3b879ac70071b8b3225aa0cb8cffb7efd /external | |
| parent | tdf#138471 wrong adjustment used for spinbutton (diff) | |
| download | core-9ac5e72d01b3d95596b7c6aa8e701514c69b6f88.tar.gz core-9ac5e72d01b3d95596b7c6aa8e701514c69b6f88.zip | |
tdf#135202 mariadb-connector-c: enable native_password plugin
... and remove dialog authentication plugin; it quite uselessly defaults
to asking for a password on stdin, unless a function symbol is defined
by the library that links the connector static library.
There are more authentication plugins but no idea if those are needed.
Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107022
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 1 | ||||
| -rw-r--r-- | external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index 664d58b03e5e..a93e353afaa0 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -67,7 +67,6 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \ UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \ - UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \ UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \ $(if $(filter $(OS),WNT), \ diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index 2f679294f7c6..b34c3490661c 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -35,10 +35,12 @@ $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \ -e 's/@EXTERNAL_PLUGINS@/ \ 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\; \ /' \ -e 's/@BUILTIN_PLUGINS@/ \ (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) \ /' \ > libmariadb/ma_client_plugin.c \ )) |