* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Thanks to Paul Kelly for contributing the original code for these
with versions before 10.2, as they do not define there there specific symbols.
*/
-// Newer (>= 10.2) MariaDB
+/* Newer (>= 10.2) MariaDB */
#if defined MARIADB_VERSION_ID
#define EXIM_MxSQL_VERSION_ID MARIADB_VERSION_ID
-// MySQL defines MYSQL_VERSION_ID, and MariaDB does so
-// https://dev.mysql.com/doc/refman/5.7/en/c-api-server-client-versions.html
+/* MySQL defines MYSQL_VERSION_ID, and MariaDB does so */
+/* https://dev.mysql.com/doc/refman/5.7/en/c-api-server-client-versions.html */
#elif defined LIBMYSQL_VERSION_ID
#define EXIM_MxSQL_VERSION_ID LIBMYSQL_VERSION_ID
#elif defined MYSQL_VERSION_ID
#define EXIM_MYSQL_VERSION_ID 0
#endif
-// Newer (>= 10.2) MariaDB
+/* Newer (>= 10.2) MariaDB */
#ifdef MARIADB_CLIENT_VERSION_STR
#define EXIM_MxSQL_VERSION_STR MARIADB_CLIENT_VERSION_STR
-// Mysql uses MYSQL_SERVER_VERSION
+/* Mysql uses MYSQL_SERVER_VERSION */
#elif defined LIBMYSQL_VERSION
#define EXIM_MxSQL_VERSION_STR LIBMYSQL_VERSION
#elif defined MYSQL_SERVER_VERSION
#define EXIM_MxSQL_VERSION_STR MYSQL_SERVER_VERSION
#else
-#define EXIM_MxSQL_VERSION_STR "N.A."
+#define EXIM_MxSQL_VERSION_STR "unknown"
#endif
#if defined MARIADB_BASE_VERSION
while ((cn = mysql_connections) != NULL)
{
mysql_connections = cn->next;
- DEBUG(D_lookup) debug_printf("close MYSQL connection: %s\n", cn->server);
+ DEBUG(D_lookup) debug_printf_indent("close MYSQL connection: %s\n", cn->server);
mysql_close(cn->handle);
}
}
nextinlist temporary buffer. The copy of the string that is used for caching
has the password removed. This copy is also used for debugging output. */
-for (i = 3; i > 0; i--)
+for (int i = 3; i > 0; i--)
{
uschar *pp = Ustrrchr(server, '/');
if (pp == NULL)
if (sdata[1][0] == 0) sdata[1] = NULL;
DEBUG(D_lookup)
- debug_printf("MYSQL new connection: host=%s port=%d socket=%s "
+ debug_printf_indent("MYSQL new connection: host=%s port=%d socket=%s "
"database=%s user=%s\n", sdata[0], port, socket, sdata[1], sdata[2]);
/* Get store for a new handle, initialize it, and connect to the server */
- mysql_handle = store_get(sizeof(MYSQL));
+ mysql_handle = store_get(sizeof(MYSQL), FALSE);
mysql_init(mysql_handle);
mysql_options(mysql_handle, MYSQL_READ_DEFAULT_GROUP, CS group);
if (mysql_real_connect(mysql_handle,
/* Add the connection to the cache */
- cn = store_get(sizeof(mysql_connection));
+ cn = store_get(sizeof(mysql_connection), FALSE);
cn->server = server_copy;
cn->handle = mysql_handle;
cn->next = mysql_connections;
else
{
DEBUG(D_lookup)
- debug_printf("MYSQL using cached connection for %s\n", server_copy);
+ debug_printf_indent("MYSQL using cached connection for %s\n", server_copy);
}
/* Run the query */
want to cache the result; also the whole cache for the handle must be cleaned
up. Setting do_cache zero requests this. */
-if ((mysql_result = mysql_use_result(mysql_handle)) == NULL)
+if (!(mysql_result = mysql_use_result(mysql_handle)))
{
if ( mysql_field_count(mysql_handle) == 0 )
{
- DEBUG(D_lookup) debug_printf("MYSQL: query was not one that returns data\n");
+ DEBUG(D_lookup) debug_printf_indent("MYSQL: query was not one that returns data\n");
result = string_cat(result,
string_sprintf("%d", mysql_affected_rows(mysql_handle)));
*do_cache = 0;
if (result)
result = string_catn(result, US"\n", 1);
- if (num_fields == 1)
- {
- if (mysql_row_data[0] != NULL) /* NULL value yields nothing */
- {
- result = string_catn(result, US mysql_row_data[0],
- lengths[0]);
- (void) string_from_gstring(result);
- }
- }
+ if (num_fields != 1)
+ for (int i = 0; i < num_fields; i++)
+ result = lf_quote(US fields[i].name, US mysql_row_data[i], lengths[i],
+ result);
- else for (i = 0; i < num_fields; i++)
- result = lf_quote(US fields[i].name, US mysql_row_data[i], lengths[i], result);
+ else if (mysql_row_data[0] != NULL) /* NULL value yields nothing */
+ result = string_catn(result, US mysql_row_data[0], lengths[0]);
}
/* more results? -1 = no, >0 = error, 0 = yes (keep looping)
This is needed because of the CLIENT_MULTI_RESULTS on mysql_real_connect(),
we don't expect any more results. */
-while((i = mysql_next_result(mysql_handle)) >= 0) {
- if(i == 0) { /* Just ignore more results */
- DEBUG(D_lookup) debug_printf("MYSQL: got unexpected more results\n");
- continue;
- }
+while((i = mysql_next_result(mysql_handle)) >= 0)
+ {
+ if(i == 0) /* Just ignore more results */
+ {
+ DEBUG(D_lookup) debug_printf_indent("MYSQL: got unexpected more results\n");
+ continue;
+ }
- *errmsg = string_sprintf("MYSQL: lookup result error when checking for more results: %s\n",
- mysql_error(mysql_handle));
- goto MYSQL_EXIT;
-}
+ *errmsg = string_sprintf(
+ "MYSQL: lookup result error when checking for more results: %s\n",
+ mysql_error(mysql_handle));
+ goto MYSQL_EXIT;
+ }
/* If result is NULL then no data has been found and so we return FAIL.
Otherwise, we must terminate the string which has been built; string_cat()
yield = FAIL;
*errmsg = US"MYSQL: no data found";
}
-else
- {
- (void) string_from_gstring(result);
- store_reset(result->s + result->ptr + 1);
- }
/* Get here by goto from various error checks and from the case where no data
was read (e.g. an update query). */
if (result)
{
- *resultptr = result->s;
+ *resultptr = string_from_gstring(result);
+ gstring_release_unused(result);
return OK;
}
else
{
- DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+ DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
return yield; /* FAIL or DEFER */
}
}
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
if (count == 0) return s;
-t = quoted = store_get(Ustrlen(s) + count + 1);
+t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));
while ((c = *s++) != 0)
{
git://git.exim.org / exim.git / blobdiff