X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=src%2Fsrc%2Flookups%2Fmysql.c;h=88a072ea911458868156d7c5178902c5593f89a1;hb=9f4001740f061f29c65835c6f7efcab50c27db13;hp=1984e30b2f460f98e144e8e628028b687766ee8e;hpb=42c7f0b4ea09d8971a19beeef743ec8981d4aacc;p=exim.git diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c index 1984e30b2..88a072ea9 100644 --- a/src/src/lookups/mysql.c +++ b/src/src/lookups/mysql.c @@ -81,7 +81,7 @@ static mysql_connection *mysql_connections = NULL; /* See local README for interface description. */ static void * -mysql_open(uschar *filename, uschar **errmsg) +mysql_open(const uschar * filename, uschar ** errmsg) { return (void *)(1); /* Just return something non-null */ } @@ -122,6 +122,7 @@ Arguments: errmsg where to point an error message defer_break TRUE if no more servers are to be tried after DEFER do_cache set zero if data is changed + opts options The server string is of the form "host/dbname/user/password". The host can be host:port. This string is in a nextinlist temporary buffer, so can be @@ -132,7 +133,7 @@ Returns: OK, FAIL, or DEFER static int perform_mysql_search(const uschar *query, uschar *server, uschar **resultptr, - uschar **errmsg, BOOL *defer_break, uint *do_cache) + uschar **errmsg, BOOL *defer_break, uint *do_cache, const uschar * opts) { MYSQL *mysql_handle = NULL; /* Keep compilers happy */ MYSQL_RES *mysql_result = NULL; @@ -155,7 +156,7 @@ has the password removed. This copy is also used for debugging output. */ for (int i = 3; i > 0; i--) { uschar *pp = Ustrrchr(server, '/'); - if (pp == NULL) + if (!pp) { *errmsg = string_sprintf("incomplete MySQL server data: %s", (i == 3)? server : server_copy); @@ -172,10 +173,7 @@ sdata[0] = server; /* What's left at the start */ for (cn = mysql_connections; cn; cn = cn->next) if (Ustrcmp(cn->server, server_copy) == 0) - { - mysql_handle = cn->handle; - break; - } + { mysql_handle = cn->handle; break; } /* If no cached connection, we must set one up. Mysql allows for a host name and port to be specified. It also allows the name of a Unix socket to be used. @@ -232,7 +230,7 @@ if (!cn) /* 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, @@ -248,7 +246,7 @@ if (!cn) /* 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; @@ -283,7 +281,7 @@ up. Setting do_cache zero requests this. */ if (!(mysql_result = mysql_use_result(mysql_handle))) { - if ( mysql_field_count(mysql_handle) == 0 ) + if (mysql_field_count(mysql_handle) == 0) { DEBUG(D_lookup) debug_printf_indent("MYSQL: query was not one that returns data\n"); result = string_cat(result, @@ -328,18 +326,15 @@ while ((mysql_row_data = mysql_fetch_row(mysql_result))) we don't expect any more results. */ while((i = mysql_next_result(mysql_handle)) >= 0) - { - if(i == 0) /* Just ignore more results */ + if(i != 0) { - 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; - } + else /* just ignore more results */ + DEBUG(D_lookup) debug_printf_indent("MYSQL: got unexpected more results\n"); /* 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() @@ -366,7 +361,7 @@ if (mysql_result) mysql_free_result(mysql_result); if (result) { *resultptr = string_from_gstring(result); - store_reset(result->s + (result->size = result->ptr + 1)); + gstring_release_unused(result); return OK; } else @@ -389,11 +384,12 @@ query is deferred with a retryable error is now in a separate function that is shared with other SQL lookups. */ static int -mysql_find(void *handle, uschar *filename, const uschar *query, int length, - uschar **result, uschar **errmsg, uint *do_cache) +mysql_find(void * handle, const uschar * filename, const uschar * query, + int length, uschar ** result, uschar ** errmsg, uint * do_cache, + const uschar * opts) { return lf_sqlperform(US"MySQL", US"mysql_servers", mysql_servers, query, - result, errmsg, do_cache, perform_mysql_search); + result, errmsg, do_cache, opts, perform_mysql_search); } @@ -432,7 +428,7 @@ while ((c = *t++) != 0) 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) { @@ -484,15 +480,15 @@ fprintf(f, " Exim version %s\n", EXIM_VERSION_STR); /* These are the lookup_info blocks for this driver */ static lookup_info mysql_lookup_info = { - US"mysql", /* lookup name */ - lookup_querystyle, /* query-style lookup */ - mysql_open, /* open function */ - NULL, /* no check function */ - mysql_find, /* find function */ - NULL, /* no close function */ - mysql_tidy, /* tidy function */ - mysql_quote, /* quoting function */ - mysql_version_report /* version reporting */ + .name = US"mysql", /* lookup name */ + .type = lookup_querystyle, /* query-style lookup */ + .open = mysql_open, /* open function */ + .check = NULL, /* no check function */ + .find = mysql_find, /* find function */ + .close = NULL, /* no close function */ + .tidy = mysql_tidy, /* tidy function */ + .quote = mysql_quote, /* quoting function */ + .version_report = mysql_version_report /* version reporting */ }; #ifdef DYNLOOKUP