CONC-161: Increase username length to 128

mariadb-corporation · Feb 21, 2016 · dc1a871 · dc1a871
1 parent 9818a85
commit dc1a871
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/mariadb_com.h b/include/mariadb_com.h
@@ -33,7 +33,7 @@
 #define NAME_LEN	256		/* Field/table name length */
 #define HOSTNAME_LENGTH 60
 #define SYSTEM_MB_MAX_CHAR_LENGTH 3
-#define USERNAME_CHAR_LENGTH 16
+#define USERNAME_CHAR_LENGTH 128
 #define USERNAME_LENGTH USERNAME_CHAR_LENGTH * SYSTEM_MB_MAX_CHAR_LENGTH
 #define SERVER_VERSION_LENGTH 60
 #define SQLSTATE_LENGTH 5

diff --git a/plugins/auth/my_auth.c b/plugins/auth/my_auth.c
@@ -73,7 +73,7 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
       return CR_SERVER_HANDSHAKE_ERR;
 
     /* save it in MYSQL */
-    memcpy(mysql->scramble_buff, pkt, SCRAMBLE_LENGTH);
+    memmove(mysql->scramble_buff, pkt, SCRAMBLE_LENGTH);
     mysql->scramble_buff[SCRAMBLE_LENGTH] = 0;
   }