diff options
| author | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
| commit | 36dd82c1d5b8426f74b698182f9fac05e65682ac (patch) | |
| tree | 4aa3e74d29fde5abc55c20c2c14e6c286e467c6e /sql/sql_acl.h | |
| parent | f655ba9866e62296e773b1717c51301d528404fe (diff) | |
| parent | 765053c83894458a15a82cce5e9b549c210db42c (diff) | |
| download | mariadb-git-36dd82c1d5b8426f74b698182f9fac05e65682ac.tar.gz | |
merge commit, hope that none of bar and dlenev changes were
lost.
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 0dc8c058b3d..0b2df8e765a 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -111,9 +111,9 @@ public: acl_host_and_ip host; uint hostname_length; USER_RESOURCES user_resource; - char *user,*password; - ulong salt[6]; // New password has longer length - uint8 pversion; // password version + char *user; + uint8 salt[SCRAMBLE_LENGTH+1]; // scrambled password in binary form + uint8 salt_len; // 0 - no password, 4 - 3.20, 8 - 3.23, 20 - 4.1.1 enum SSL_type ssl_type; const char *ssl_cipher, *x509_issuer, *x509_subject; }; @@ -135,11 +135,8 @@ void acl_reload(THD *thd); void acl_free(bool end=0); ulong acl_get(const char *host, const char *ip, const char *bin_ip, const char *user, const char *db, my_bool db_is_pattern); -ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, - const char *password,const char *scramble, - char **priv_user, char *priv_host, - bool old_ver, USER_RESOURCES *max,char* prepared_scramble, - uint *cur_priv_version, ACL_USER **cached_user); +int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd, + uint passwd_len); bool acl_check_host(const char *host, const char *ip); bool check_change_password(THD *thd, const char *host, const char *user); bool change_password(THD *thd, const char *host, const char *user, |