diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-05 13:35:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:15 +0100 |
| commit | 0ce8703e99dabfa95d1cc0cd720c14f68d4cdda5 (patch) | |
| tree | 3065eb39a47a1e5bb6520837c64179c420c2b17f | |
| parent | 5e17ca565e3d1aa9bbb096c60d01eadfef651ddb (diff) | |
| download | mariadb-git-0ce8703e99dabfa95d1cc0cd720c14f68d4cdda5.tar.gz | |
password validation plugin API: renames
| -rw-r--r-- | include/mysql/plugin_password_validation.h | 6 | ||||
| -rw-r--r-- | include/mysql/plugin_password_validation.h.pp | 2 | ||||
| -rw-r--r-- | plugin/cracklib_password_check/cracklib_password_check.c | 2 | ||||
| -rw-r--r-- | plugin/simple_password_check/simple_password_check.c | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/mysql/plugin_password_validation.h b/include/mysql/plugin_password_validation.h index 0bbb8f481c2..f3ca5c7e0cf 100644 --- a/include/mysql/plugin_password_validation.h +++ b/include/mysql/plugin_password_validation.h @@ -17,9 +17,9 @@ /** @file - Authentication Plugin API. + Password Validation Plugin API. - This file defines the API for server authentication plugins. + This file defines the API for server password validation plugins. */ #define MYSQL_PLUGIN_PASSWORD_VALIDATION_INCLUDED @@ -31,7 +31,7 @@ /** Password validation plugin descriptor */ -struct st_mysql_password_validation +struct st_mariadb_password_validation { int interface_version; /**< version plugin uses */ /** diff --git a/include/mysql/plugin_password_validation.h.pp b/include/mysql/plugin_password_validation.h.pp index 77782fb81ee..0a88110685f 100644 --- a/include/mysql/plugin_password_validation.h.pp +++ b/include/mysql/plugin_password_validation.h.pp @@ -353,7 +353,7 @@ void *thd_get_ha_data(const void* thd, const struct handlerton *hton); void thd_set_ha_data(void* thd, const struct handlerton *hton, const void *ha_data); void thd_wakeup_subsequent_commits(void* thd, int wakeup_error); -struct st_mysql_password_validation +struct st_mariadb_password_validation { int interface_version; int (*validate_password)(MYSQL_LEX_STRING *username, diff --git a/plugin/cracklib_password_check/cracklib_password_check.c b/plugin/cracklib_password_check/cracklib_password_check.c index cb03c054b22..c16075df74b 100644 --- a/plugin/cracklib_password_check/cracklib_password_check.c +++ b/plugin/cracklib_password_check/cracklib_password_check.c @@ -58,7 +58,7 @@ static struct st_mysql_sys_var* sysvars[]= { NULL }; -static struct st_mysql_password_validation info= +static struct st_mariadb_password_validation info= { MariaDB_PASSWORD_VALIDATION_INTERFACE_VERSION, crackme diff --git a/plugin/simple_password_check/simple_password_check.c b/plugin/simple_password_check/simple_password_check.c index 6d046d9cada..af11046a08a 100644 --- a/plugin/simple_password_check/simple_password_check.c +++ b/plugin/simple_password_check/simple_password_check.c @@ -79,7 +79,7 @@ static struct st_mysql_sys_var* sysvars[]= { NULL }; -static struct st_mysql_password_validation info= +static struct st_mariadb_password_validation info= { MariaDB_PASSWORD_VALIDATION_INTERFACE_VERSION, validate diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 2c3257d0ada..2a92bef4cf6 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -879,8 +879,8 @@ struct validation_data { LEX_STRING *user, *password; }; static my_bool do_validate(THD *, plugin_ref plugin, void *arg) { struct validation_data *data= (struct validation_data *)arg; - struct st_mysql_password_validation *handler= - (st_mysql_password_validation *)plugin_decl(plugin)->info; + struct st_mariadb_password_validation *handler= + (st_mariadb_password_validation *)plugin_decl(plugin)->info; return handler->validate_password(data->user, data->password); } |