diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-20 11:48:02 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-20 11:48:02 +0100 |
| commit | 10096d9185838a9b258b84f282b0218b792cef5c (patch) | |
| tree | 6fee5c46d6882a6a3a9fbf819dc529eeac4e1602 /sql/password.c | |
| parent | 428794050fbf69072d4570b162ddf9f95caf21fd (diff) | |
| download | mariadb-git-10096d9185838a9b258b84f282b0218b792cef5c.tar.gz | |
fixed bad merge (s/rnd/my_rnd/)
Diffstat (limited to 'sql/password.c')
| -rw-r--r-- | sql/password.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/password.c b/sql/password.c index 9752bcc95eb..257547671e5 100644 --- a/sql/password.c +++ b/sql/password.c @@ -118,7 +118,7 @@ static void old_randominit(struct rand_struct *rand_st,ulong seed1) Generate Random number SYNOPSIS - rnd() + my_rnd() rand_st INOUT Structure used for number generation RETURN @@ -152,7 +152,7 @@ void create_random_string(int length,struct rand_struct *rand_st,char *target) char *end=target+length; /* Use pointer arithmetics as it is faster way to do so. */ for (; target<end ; target++) - *target= (char) (rnd(rand_st)*94+33); + *target= (char) (my_rnd(rand_st)*94+33); } @@ -293,7 +293,7 @@ void make_scrambled_password(char *to,const char *password, { to[0]=PVERSION41_CHAR; /* New passwords have version prefix */ /* Rnd returns number from 0 to 1 so this would be good salt generation.*/ - salt=(unsigned short) (rnd(rand_st)*65535+1); + salt=(unsigned short) (my_rnd(rand_st)*65535+1); /* Use only 2 first bytes from it */ sprintf(to+1,"%04x",salt); /* First hasing is done without salt */ |