database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORK

Browse Source 
Description: The command FLUSH DES_KEY_FILE is expected to
reload the DES keys from the file that was specified with
the "--des-key-file" option at server startup. But it is not
behaving as expected.

Analysis: The des file reload is defined within a wrong
conditional directive, rendering the command ineffective.
Macro "OPENSSL" was used instead of "HAVE_OPENSSL" macro.

Fix: "OPENSSL" macro is changed to "HAVE_OPENSSL".
This commit is contained in:
Arun Kuruvila
2015-09-22 14:51:48 +05:30
parent 8ea80ecfeb
commit 86375f7fa6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysqld.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -349,6 +349,7 @@ extern mysql_mutex_t
extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count;
extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thd_remove; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thd_remove;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
extern char* des_key_file;
extern mysql_mutex_t LOCK_des_key_file; extern mysql_mutex_t LOCK_des_key_file;
#endif #endif
extern mysql_mutex_t LOCK_server_started; extern mysql_mutex_t LOCK_server_started;

5
sql/sql_reload.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
#include "hostname.h" // hostname_cache_refresh #include "hostname.h" // hostname_cache_refresh
#include "sql_repl.h" // reset_master, reset_slave #include "sql_repl.h" // reset_master, reset_slave
#include "debug_sync.h" #include "debug_sync.h"
#include "des_key_file.h"
/** /**
@@ -297,7 +298,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
} }
} }
#endif #endif
#ifdef OPENSSL #ifdef HAVE_OPENSSL
if (options & REFRESH_DES_KEY_FILE) if (options & REFRESH_DES_KEY_FILE)
{ {
if (des_key_file && load_des_key_file(des_key_file)) if (des_key_file && load_des_key_file(des_key_file))