On Windows SSL works with sockets only, so we shouldn't tell the client

that we support SSL when using named pipes or shared memory.
MariaDB · Jan 27, 2016 · 33e5a8a · 33e5a8a
1 parent ef3ca5c
commit 33e5a8a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
@@ -11260,13 +11260,16 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
   *end++= protocol_version;
 
   thd->client_capabilities= CLIENT_BASIC_FLAGS;
-
+ 
   if (opt_using_transactions)
     thd->client_capabilities|= CLIENT_TRANSACTIONS;
 
   thd->client_capabilities|= CAN_CLIENT_COMPRESS;
 
-  if (ssl_acceptor_fd)
+  /* Currently we support SSL with sockets only */
+  if (thd->active_vio->type != VIO_TYPE_NAMEDPIPE &&
+      thd->active_vio->type != VIO_TYPE_SHARED_MEMORY &&
+      ssl_acceptor_fd)
   {
     thd->client_capabilities |= CLIENT_SSL;
     thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT;