summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <jimw@rama.(none)>2006-07-24 16:45:26 -0700
committerunknown <jimw@rama.(none)>2006-07-24 16:45:26 -0700
commit14fef80d98d14ea923701262b81954d88a9b13b1 (patch)
treed24e85a81ecddbc8e760854b7e45effc8f4c3385 /sql/sql_acl.cc
parentdc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f (diff)
downloadmariadb-git-14fef80d98d14ea923701262b81954d88a9b13b1.tar.gz
Bug #10668: CREATE USER does not enforce username length limit
This appears to have just been an oversight -- CREATE USER was not enforcing the existing username limitations. mysql-test/r/grant.result: Add new results mysql-test/t/grant.test: Add new regression test sql/sql_acl.cc: Enforce the user and host name limits in mysql_create_user().
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index ae5ea210a47..3735f4403de 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -5220,7 +5220,16 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list)
{
result= TRUE;
continue;
- }
+ }
+
+ if (user_name->host.length > HOSTNAME_LENGTH ||
+ user_name->user.length > USERNAME_LENGTH)
+ {
+ append_user(&wrong_users, user_name);
+ result= TRUE;
+ continue;
+ }
+
/*
Search all in-memory structures and grant tables
for a mention of the new user name.