diff options
| author | unknown <dlenev@dlenev.mshome> | 2003-07-23 18:50:18 +0400 |
|---|---|---|
| committer | unknown <dlenev@dlenev.mshome> | 2003-07-23 18:50:18 +0400 |
| commit | af8d09ff476494e262354cebed5dd9462877d75e (patch) | |
| tree | cc518a283b070e8bc9e3774f6981834a12c98b46 /sql | |
| parent | 9b675b8be0ab30ce9a4a0a16a0932f163d9f1d87 (diff) | |
| download | mariadb-git-af8d09ff476494e262354cebed5dd9462877d75e.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 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 1bdca7167e8..51c05ccbf33 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -590,7 +590,6 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, /* OK. User found and password checked continue validation */ -#ifdef HAVE_OPENSSL { Vio *vio=thd->net.vio; /* @@ -604,6 +603,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; @@ -686,11 +686,17 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, free(ptr); } break; +#else /* HAVE_OPENSSL */ + default: + /* + If we don't have SSL but SSL is required for this user the + authentication should fail. + */ + break; +#endif /* HAVE_OPENSSL */ } } -#else /* HAVE_OPENSSL */ - user_access=acl_user->access; -#endif /* HAVE_OPENSSL */ + *mqh=acl_user->user_resource; if (!acl_user->user) *priv_user=(char*) ""; // Change to anonymous user /* purecov: inspected */ |