On 2018-03-01 01:13, Wietse Venema wrote:
> Wietse Venema:
>> olli hauer:
>>> On 2018-02-25 23:00, olli hauer wrote:
>>>> On 2018-02-25 17:19, Wietse Venema wrote:
>>> ...
>>>>>
>>>>> #if MYSQL_VERSION_ID >= 80000 && !defined(MARIADB_VERSION_ID)
>>>>> #define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_MODE
>>>>> #elif MYSQL_VERSION_ID >= 50023
>>>>> #define DICT_MYSQL_SSL_VERIFY_SERVER_CERT
>>>>> MYSQL_OPT_SSL_VERIFY_SERVER_CERT
>>>>> #endif
>>>
>>> I've updated the patch, since mariadb 10.0 also has a higher
>>> MYSQL_VERSION_ID but does not define MARIADB_VERSION_ID.
>>>
>>> Testing against MARIADB_BASE_VERSION should do the trick, e.g. the values
>>> from mariadb 5.5, 10.0 and 10.2
>>> #define MARIADB_BASE_VERSION "mariadb-5.5"
>>> #define MARIADB_BASE_VERSION "mariadb-10.0"
>>> #define MARIADB_BASE_VERSION "mariadb-10.2"
>>>
>>> Updated patch is attached or can be found here:
>>>
>>> https://people.freebsd.org/~ohauer/postfix.dict__mysql/patch-src_global_dict__mysql.c_v2.diff
>
> Aargh. I messed up cut-and-paste. Hre it comes again.
>
> While we're improving the code, do you think that this would work:
>
> #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50023
> #define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_VERIFY_SERVER_CERT
> #elif MYSQL_VERSION_ID >= 80000
> #define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_MODE
> #endif
>
> That is, have all the Mariadb-related conditions together on the
> same line, instead of distributing those conditions over two different
> lines.
>
Hello Wietse,
Yes, this will also work.
I've build with both patches (v2 and v3) against all databases listed in the
first mail.
All build logs and the patch v2 / v3 are packed in the following archive for
review.
https://people.freebsd.org/~ohauer/postfix.dict__mysql/postfix-sql_build_logs.tar.gz
Attached is the new patch (version 3) with your latest suggestions.
--
olli
--- src/global/dict_mysql.c.orig 2017-02-19 01:58:20 UTC
+++ src/global/dict_mysql.c
@@ -198,6 +198,15 @@
#include "dict_mysql.h"
+/* MySQL 8.x API change */
+
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50023
+#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+#elif MYSQL_VERSION_ID >= 80000
+#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_MODE
+#endif
+
+
/* need some structs to help organize things */
typedef struct {
MYSQL *db;
@@ -237,7 +246,7 @@ typedef struct {
char *tls_CAfile;
char *tls_CApath;
char *tls_ciphers;
-#if MYSQL_VERSION_ID >= 50023
+#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT)
int tls_verify_cert;
#endif
#endif
@@ -656,9 +665,9 @@ static void plmysql_connect_single(DICT_
dict_mysql->tls_key_file, dict_mysql->tls_cert_file,
dict_mysql->tls_CAfile, dict_mysql->tls_CApath,
dict_mysql->tls_ciphers);
-#if MYSQL_VERSION_ID >= 50023
+#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT)
if (dict_mysql->tls_verify_cert != -1)
- mysql_options(host->db, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+ mysql_options(host->db, DICT_MYSQL_SSL_VERIFY_SERVER_CERT,
&dict_mysql->tls_verify_cert);
#endif
#endif
@@ -723,7 +732,7 @@ static void mysql_parse_config(DICT_MYSQ
dict_mysql->tls_CAfile = cfg_get_str(p, "tls_CAfile", NULL, 0, 0);
dict_mysql->tls_CApath = cfg_get_str(p, "tls_CApath", NULL, 0, 0);
dict_mysql->tls_ciphers = cfg_get_str(p, "tls_ciphers", NULL, 0, 0);
-#if MYSQL_VERSION_ID >= 50023
+#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT)
dict_mysql->tls_verify_cert = cfg_get_bool(p, "tls_verify_cert", -1);
#endif
#endif
