diff options
| author | monty@narttu.mysql.fi <> | 2003-03-19 22:25:44 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-03-19 22:25:44 +0200 |
| commit | b883a9c01c9caba9e74bdc6f4f5b57b1a81a0fd4 (patch) | |
| tree | abbee7d78d1399086c301a5bd02f3ba4a9e1ea38 /sql/password.c | |
| parent | 48a9c1239c6b2b2ba27f8a1a9a0df98af204d53b (diff) | |
| parent | 584729430a77280e753cc4bf67d2bb6d7f94a6b8 (diff) | |
| download | mariadb-git-b883a9c01c9caba9e74bdc6f4f5b57b1a81a0fd4.tar.gz | |
Merge with 4.0.12
Diffstat (limited to 'sql/password.c')
| -rw-r--r-- | sql/password.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/password.c b/sql/password.c index 5ed05ae6c0e..9752bcc95eb 100644 --- a/sql/password.c +++ b/sql/password.c @@ -125,7 +125,7 @@ static void old_randominit(struct rand_struct *rand_st,ulong seed1) Generated pseudo random number */ -double rnd(struct rand_struct *rand_st) +double my_rnd(struct rand_struct *rand_st) { rand_st->seed1=(rand_st->seed1*3+rand_st->seed2) % rand_st->max_value; rand_st->seed2=(rand_st->seed1+rand_st->seed2+33) % rand_st->max_value; @@ -435,7 +435,7 @@ char get_password_version(const char *password) -inline uint char_val(char X) +static inline unsigned int char_val(char X) { return (uint) (X >= '0' && X <= '9' ? X-'0' : X >= 'A' && X <= 'Z' ? X-'A'+10 : @@ -652,10 +652,10 @@ char *scramble(char *to,const char *message,const char *password, randominit(&rand_st,hash_pass[0] ^ hash_message[0], hash_pass[1] ^ hash_message[1]); while (*msg++) - *to++= (char) (floor(rnd(&rand_st)*31)+64); + *to++= (char) (floor(my_rnd(&rand_st)*31)+64); if (!old_ver) { /* Make it harder to break */ - char extra=(char) (floor(rnd(&rand_st)*31)); + char extra=(char) (floor(my_rnd(&rand_st)*31)); while (to_start != to) *(to_start++)^=extra; } @@ -711,11 +711,11 @@ my_bool check_scramble(const char *scrambled, const char *message, hash_pass[1] ^ hash_message[1]); to=buff; for (pos=scrambled ; *pos ; pos++) - *to++=(char) (floor(rnd(&rand_st)*31)+64); + *to++=(char) (floor(my_rnd(&rand_st)*31)+64); if (old_ver) extra=0; else - extra=(char) (floor(rnd(&rand_st)*31)); + extra=(char) (floor(my_rnd(&rand_st)*31)); to=buff; while (*scrambled) { |