diff options
| author | serg@serg.mylan <> | 2006-01-03 18:12:03 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2006-01-03 18:12:03 +0100 |
| commit | 30c09d6dc09adcd8aac8769af49402e1812d6455 (patch) | |
| tree | cfc5357eb7d1e59ea0163aa88d31bcf7644151d7 /sql/sql_acl.cc | |
| parent | 8ce6f3e6ca7fedd2142e784e9aeab72ec2e49951 (diff) | |
| parent | 14f94dc0cad1419e74047956c059c1cf9c3e7a2c (diff) | |
| download | mariadb-git-30c09d6dc09adcd8aac8769af49402e1812d6455.tar.gz | |
merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 110b529fffc..5d03524f531 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -938,7 +938,7 @@ bool acl_getroot_no_password(Security_context *sctx, char *user, char *host, DBUG_PRINT("enter", ("Host: '%s', Ip: '%s', User: '%s', db: '%s'", (host ? host : "(NULL)"), (ip ? ip : "(NULL)"), - (user ? user : "(NULL)"), (db ? db : "(NULL)"))); + user, (db ? db : "(NULL)"))); sctx->user= user; sctx->host= host; sctx->ip= ip; @@ -967,7 +967,7 @@ bool acl_getroot_no_password(Security_context *sctx, char *user, char *host, for (i=0 ; i < acl_users.elements ; i++) { acl_user= dynamic_element(&acl_users,i,ACL_USER*); - if ((!acl_user->user && (!user || !user[0])) || + if ((!acl_user->user && !user[0]) || (acl_user->user && strcmp(user, acl_user->user) == 0)) { if (compare_hostname(&acl_user->host, host, ip)) @@ -4954,8 +4954,6 @@ static int handle_grant_struct(uint struct_no, bool drop, } if (! user) user= ""; - if (! host) - host= ""; #ifdef EXTRA_DEBUG DBUG_PRINT("loop",("scan struct: %u index: %u user: '%s' host: '%s'", struct_no, idx, user, host)); |