diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /plugin | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_ed25519/ed25519-t.c | 2 | ||||
| -rw-r--r-- | plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test | 1 | ||||
| -rw-r--r-- | plugin/auth_gssapi/sspi_server.cc | 9 | ||||
| -rw-r--r-- | plugin/user_variables/user_variables.cc | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/plugin/auth_ed25519/ed25519-t.c b/plugin/auth_ed25519/ed25519-t.c index f7d58c48d7c..fa058f69325 100644 --- a/plugin/auth_ed25519/ed25519-t.c +++ b/plugin/auth_ed25519/ed25519-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <tap.h> #include <m_string.h> diff --git a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test index f47ad8c20e2..2307aa3934a 100644 --- a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test +++ b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test @@ -1,3 +1,4 @@ +--replace_regex /name '[^']+'/name 'localhost'/ INSTALL SONAME 'auth_gssapi'; # diff --git a/plugin/auth_gssapi/sspi_server.cc b/plugin/auth_gssapi/sspi_server.cc index c382c447ef3..af78829df6e 100644 --- a/plugin/auth_gssapi/sspi_server.cc +++ b/plugin/auth_gssapi/sspi_server.cc @@ -40,7 +40,7 @@ static void log_error(SECURITY_STATUS err, const char *msg) { char buf[1024]; sspi_errmsg(err, buf, sizeof(buf)); - my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, msg, buf); + my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, err, msg, buf); } else { @@ -101,7 +101,12 @@ static int get_client_name_from_context(CtxtHandle *ctxt, *p = 0; } strncpy(name, native_names.sClientName, name_len); - FreeContextBuffer(&native_names); + + if (native_names.sClientName) + FreeContextBuffer(native_names.sClientName); + if (native_names.sServerName) + FreeContextBuffer(native_names.sServerName); + return CR_OK; } diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc index 227455e5696..80bf58612b5 100644 --- a/plugin/user_variables/user_variables.cc +++ b/plugin/user_variables/user_variables.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define MYSQL_SERVER #include <my_global.h> |