diff options
| author | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
| commit | eaa5e05b05aaead8be1d95902e8a16a57ca6fff3 (patch) | |
| tree | a08ffe6a07c8efcc13a357c5478274972fd673b0 /sql/sql_acl.h | |
| parent | 073f2d775ea2ccd29b5081165f1c2066284fa450 (diff) | |
| parent | b1af42c3a780c81f6a42c69b5b8f43e38e7272cb (diff) | |
| download | mariadb-git-eaa5e05b05aaead8be1d95902e8a16a57ca6fff3.tar.gz | |
manual merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
merge commit
convert of database to utf8 in case of cahnge_user added
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 ca976f43999..e3566e4ec39 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, |