diff options
| author | unknown <dlenev@mysql.com> | 2003-07-30 03:33:48 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-07-30 03:33:48 +0400 |
| commit | c221c526862f542b251972e5861912b26c2d0350 (patch) | |
| tree | c652829ebbf71842b77d1bed13497bba9a79d1ad /sql | |
| parent | e6687373fb5a65a9a46ac1719b0a4f6e8f8a2458 (diff) | |
| download | mariadb-git-c221c526862f542b251972e5861912b26c2d0350.tar.gz | |
Fix security bug. mysqld server without ssl support was completly
ignorant about ssl_type attribute
sql/sql_acl.cc:
Now acl_getroot() honors ssl_type attribute even if we compile without openssl
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 755a72bec32..1f311e651dd 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -530,7 +530,6 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, !check_scramble(password,message,acl_user->salt, (my_bool) old_ver))) { -#ifdef HAVE_OPENSSL Vio *vio=thd->net.vio; /* In this point we know that user is allowed to connect @@ -543,6 +542,7 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, case SSL_TYPE_NONE: /* SSL is not required to connect */ user_access=acl_user->access; break; +#ifdef HAVE_OPENSSL case SSL_TYPE_ANY: /* Any kind of SSL is good enough */ if (vio_type(vio) == VIO_TYPE_SSL) user_access=acl_user->access; @@ -625,10 +625,16 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, } break; } - } #else /* HAVE_OPENSSL */ - user_access=acl_user->access; + default: + /* + If we don't have SSL but SSL is required for this user the + authentication should fail. + */ + break; #endif /* HAVE_OPENSSL */ + } + *mqh=acl_user->user_resource; if (!acl_user->user) *priv_user=(char*) ""; // Change to anonymous user /* purecov: inspected */ |