diff options
| author | davi@moksha.com.br <> | 2007-10-30 09:41:24 -0300 |
|---|---|---|
| committer | davi@moksha.com.br <> | 2007-10-30 09:41:24 -0300 |
| commit | 26f03b0bc6990da35a39915a86546f751aaade27 (patch) | |
| tree | 6db8ace6517c55c9059a81f2085a12d2f2498a70 /libmysql | |
| parent | 6d15d42eca412781ee77647f8807c4d8f037a3e1 (diff) | |
| parent | dac55f09f0f1ed0e86ce04317fe8c52a1d4bb2bd (diff) | |
| download | mariadb-git-26f03b0bc6990da35a39915a86546f751aaade27.tar.gz | |
Merge moksha.local:/Users/davi/mysql/bugs/31669-5.0
into moksha.local:/Users/davi/mysql/mysql-5.0-runtime
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e50bd16ca32..85509b49fdd 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -706,7 +706,8 @@ int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd) my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db) { - char buff[512],*end=buff; + char buff[USERNAME_LENGTH+SCRAMBLED_PASSWORD_CHAR_LENGTH+NAME_LEN+2]; + char *end= buff; int rc; DBUG_ENTER("mysql_change_user"); @@ -716,7 +717,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, passwd=""; /* Store user into the buffer */ - end=strmov(end,user)+1; + end= strmake(end, user, USERNAME_LENGTH) + 1; /* write scrambled password according to server capabilities */ if (passwd[0]) @@ -736,7 +737,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, else *end++= '\0'; /* empty password */ /* Add database if needed */ - end= strmov(end, db ? db : "") + 1; + end= strmake(end, db ? db : "", NAME_LEN) + 1; /* Write authentication package */ simple_command(mysql,COM_CHANGE_USER, buff,(ulong) (end-buff),1); |