diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-26 12:49:03 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-26 12:49:03 +0500 |
| commit | 9ec1c096e856825c18c0056eb572ff9881f259e5 (patch) | |
| tree | 3c41125e08aba515972455448a63e0046be18f6e /sql/sql_acl.cc | |
| parent | 0667d3453a52d5d51c63c2665b220c418f3b9387 (diff) | |
| parent | 4048cca387503462def7b392b964288f882c3e3d (diff) | |
| download | mariadb-git-9ec1c096e856825c18c0056eb572ff9881f259e5.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c93e082e0ff..f2f969551d1 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -552,7 +552,9 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, We need to check for absence of SSL because without SSL we should reject connection. */ - if (vio_type(vio) == VIO_TYPE_SSL && SSL_get_peer_certificate(vio->ssl_)) + if (vio_type(vio) == VIO_TYPE_SSL && + SSL_get_verify_result(vio->ssl_) == X509_V_OK && + SSL_get_peer_certificate(vio->ssl_)) user_access=acl_user->access; break; case SSL_TYPE_SPECIFIED: /* Client should have specified attrib */ @@ -560,7 +562,8 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, We need to check for absence of SSL because without SSL we should reject connection. */ - if (vio_type(vio) == VIO_TYPE_SSL) + if (vio_type(vio) == VIO_TYPE_SSL && + SSL_get_verify_result(vio->ssl_) == X509_V_OK) { if (acl_user->ssl_cipher) { |