Commit ddcb947f authored by unknown's avatar unknown
Browse files

Allow hostnames that are IP addresses with a netmask even when 

running with --skip-name-resolve. (Bug #8471)


sql/sql_acl.cc:
  Add '/' to list of characters that doesn't trigger a need for resolving the
  hostname, so that the IP mask syntax works with skip-name-resolve.
parent 1b46843c

mysql-test/r/skip_name_resolve.result

0 → 100644
+7 −0
Original line number Diff line number Diff line 
GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255';

SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255';

Grants for mysqltest_1@127.0.0.1/255.255.255.255

GRANT USAGE ON *.* TO 'mysqltest_1'@'127.0.0.1/255.255.255.255'

GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'127.0.0.1/255.255.255.255'

REVOKE ALL ON test.* FROM mysqltest_1@'127.0.0.1/255.255.255.255';

DROP USER mysqltest_1@'127.0.0.1/255.255.255.255';

mysql-test/t/skip_name_resolve-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--skip-name-resolve

mysql-test/t/skip_name_resolve.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Bug #8471: IP address with mask fail when skip-name-resolve is on

GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255';

SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255';

REVOKE ALL ON test.* FROM mysqltest_1@'127.0.0.1/255.255.255.255';

DROP USER mysqltest_1@'127.0.0.1/255.255.255.255';

sql/sql_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ bool hostname_requires_resolving(const char *hostname) 
    return FALSE;

  for (; (cur=*hostname); hostname++)

  {

    if ((cur != '%') && (cur != '_') && (cur != '.') &&

    if ((cur != '%') && (cur != '_') && (cur != '.') && (cur != '/') &&

	((cur < '0') || (cur > '9')))

      return TRUE;

  }