summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch')
-rw-r--r--sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch
new file mode 100644
index 000000000000..b669d01c79f3
--- /dev/null
+++ b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch
@@ -0,0 +1,35 @@
+--- a/src/mysql.c
++++ b/src/mysql.c
+@@ -196,6 +196,7 @@
+ int retval;
+ sql_server_t *server = &conf.sql.server;
+ unsigned int port;
++ my_bool reconnect = 1;
+
+ DENTER
+
+@@ -238,8 +239,9 @@
+ DSRETURN (NSS_UNAVAIL)
+ }
+ ci.valid = ntrue;
+- ci.link.reconnect = 0; /* Safety: We can't let MySQL assume socket is
+- still valid; see _nss_mysql_validate_socket */
++ /* Safety: We can't let MySQL assume socket is still valid;
++ see _nss_mysql_validate_socket */
++ mysql_options(&ci.link, MYSQL_OPT_RECONNECT, &reconnect);
+ DSRETURN (NSS_SUCCESS)
+ }
+ _nss_mysql_log (LOG_ALERT, "Connection to server '%s' failed: %s",
+--- a/src/nss_mysql.h
++++ b/src/nss_mysql.h
+@@ -72,6 +72,10 @@ typedef nss_status_t NSS_STATUS;
+ /* Default initializers */
+ #define DEF_TIMEOUT 3
+
++#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001
++#define my_bool bool
++#endif
++
+ #ifdef DEBUG
+ void _nss_mysql_debug (char *fmt, ...);
+ #define DEBUG_FILE "/tmp/libnss-mysql-debug.log"