diff options
| author | unknown <peter@mysql.com> | 2002-11-29 21:34:13 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-29 21:34:13 +0300 |
| commit | c1403e17a8a663fb9621d64bcb82602eb27a0716 (patch) | |
| tree | ec4afc35d34027e775dfc7af5bb08c3174e7277e /sql/password.c | |
| parent | 5f80c35306e35304595d9dcc410e3c20cb785b61 (diff) | |
| download | mariadb-git-c1403e17a8a663fb9621d64bcb82602eb27a0716.tar.gz | |
Correct bug which exposed itself in rpl000017
Commit for merge
client/connect_test.c:
Roll back wrong change
include/mysql_com.h:
Correct prototypes not to have need to include my_global.h
sql/mysql_priv.h:
Add expected hash lenght for old paswords.
sql/password.c:
Change prototypes
sql/sql_acl.cc:
Minor bug correction
Diffstat (limited to 'sql/password.c')
| -rw-r--r-- | sql/password.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/password.c b/sql/password.c index 13f8d593da6..b9eb6012354 100644 --- a/sql/password.c +++ b/sql/password.c @@ -232,7 +232,7 @@ void hash_password(ulong *result, const char *password) none */ -inline void password_hash_stage1(char *to, const char *password) +void password_hash_stage1(char *to, const char *password) { SHA1_CONTEXT context; sha1_reset(&context); @@ -259,7 +259,7 @@ inline void password_hash_stage1(char *to, const char *password) none */ -inline void password_hash_stage2(char *to,const char *salt) +void password_hash_stage2(char *to,const char *salt) { SHA1_CONTEXT context; sha1_reset(&context); @@ -398,7 +398,7 @@ my_bool validate_password(const char* password, const char* message, ulong* salt password length >0 */ -inline uint get_password_length(my_bool force_old_scramble) +inline int get_password_length(my_bool force_old_scramble) { if (force_old_scramble) return 16; @@ -418,7 +418,7 @@ inline uint get_password_length(my_bool force_old_scramble) !0 password version char for newer passwords */ -inline uint8 get_password_version(const char* password) +inline char get_password_version(const char* password) { if (password==NULL) return 0; if (password[0]==PVERSION41_CHAR) return PVERSION41_CHAR; |