diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
commit | c764bc0a78e9359fa208e074bd327f7a852c7cb7 (patch) | |
tree | eeb5d56d225d1fdf97a016c3eae7b93c4e1f6927 /sql/wsrep_sst.cc | |
parent | d702e463902bca7d94ff8a1a49468a5b7bdb4ba0 (diff) | |
parent | 15795b9f9a850d9587f17ef18e1ac7b5af31ec1e (diff) | |
download | mariadb-git-c764bc0a78e9359fa208e074bd327f7a852c7cb7.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index ba611fed0c7..e6fdf6cde43 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -79,37 +79,14 @@ static void make_wsrep_defaults_file() } -// TODO: Improve address verification. -static bool sst_receive_address_check (const char* str) -{ - if (!strncasecmp(str, "127.0.0.1", strlen("127.0.0.1")) || - !strncasecmp(str, "localhost", strlen("localhost"))) - { - return 1; - } - - return 0; -} - bool wsrep_sst_receive_address_check (sys_var *self, THD* thd, set_var* var) { - char addr_buf[FN_REFLEN]; - if ((! var->save_result.string_value.str) || (var->save_result.string_value.length > (FN_REFLEN - 1))) // safety { goto err; } - memcpy(addr_buf, var->save_result.string_value.str, - var->save_result.string_value.length); - addr_buf[var->save_result.string_value.length]= 0; - - if (sst_receive_address_check(addr_buf)) - { - goto err; - } - return 0; err: |