diff options
| author | tnurnberg@salvation.intern.azundris.com <> | 2006-08-22 14:31:57 +0200 |
|---|---|---|
| committer | tnurnberg@salvation.intern.azundris.com <> | 2006-08-22 14:31:57 +0200 |
| commit | 10c351b12443ffa2da8d894c3e91b3314d9ca98a (patch) | |
| tree | 46b44df1aaa46df168af349145591d272646586b /sql/sql_acl.cc | |
| parent | 39a8fe6e4490f77a731c33f80cfd2e307d9bb028 (diff) | |
| parent | 002adef0e184a3dd28ab162a27fce402c66e0f57 (diff) | |
| download | mariadb-git-10c351b12443ffa2da8d894c3e91b3314d9ca98a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 8984ea20241..b8be4f47d82 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -874,6 +874,7 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, sql_print_information("X509 issuer mismatch: should be '%s' " "but is '%s'", acl_user->x509_issuer, ptr); free(ptr); + user_access=NO_ACCESS; break; } user_access= acl_user->access; @@ -889,11 +890,13 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, if (strcmp(acl_user->x509_subject,ptr)) { if (global_system_variables.log_warnings) - sql_print_information("X509 subject mismatch: '%s' vs '%s'", + sql_print_information("X509 subject mismatch: should be '%s' but is '%s'", acl_user->x509_subject, ptr); + free(ptr); + user_access=NO_ACCESS; + break; } - else - user_access= acl_user->access; + user_access= acl_user->access; free(ptr); } break; |