database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-06-30 16:39:20 +02:00
parent 7c0779da7c 1dd3c8f8ba
commit 36e59752e7
273 changed files with 4467 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/auth_gssapi/gssapi_server.cc
View File

@ -43,21 +43,21 @@ static char* get_default_principal_name()
if(krb5_init_context(&context))
{
my_printf_error(0, "GSSAPI plugin : krb5_init_context failed",
my_printf_error(1, "GSSAPI plugin : krb5_init_context failed",
ME_ERROR_LOG | ME_WARNING);
goto cleanup;
}
if (krb5_sname_to_principal(context, NULL, "mariadb", KRB5_NT_SRV_HST, &principal))
{
my_printf_error(0, "GSSAPI plugin : krb5_sname_to_principal failed",
my_printf_error(1, "GSSAPI plugin : krb5_sname_to_principal failed",
ME_ERROR_LOG | ME_WARNING);
goto cleanup;
}
if (krb5_unparse_name(context, principal, &unparsed_name))
{
my_printf_error(0, "GSSAPI plugin : krb5_unparse_name failed",
my_printf_error(1, "GSSAPI plugin : krb5_unparse_name failed",
ME_ERROR_LOG | ME_WARNING);
goto cleanup;
}
@ -65,7 +65,7 @@ static char* get_default_principal_name()
/* Check for entry in keytab */
if (krb5_kt_read_service_key(context, NULL, principal, 0, (krb5_enctype)0, &key))
{
my_printf_error(0, "GSSAPI plugin : default principal '%s' not found in keytab",
my_printf_error(1, "GSSAPI plugin : default principal '%s' not found in keytab",
ME_ERROR_LOG | ME_WARNING, unparsed_name);
goto cleanup;
}
@ -103,7 +103,7 @@ int plugin_init()
/* import service principal from plain text */
if(srv_principal_name && srv_principal_name[0])
{
my_printf_error(0, "GSSAPI plugin : using principal name '%s'",
my_printf_error(1, "GSSAPI plugin : using principal name '%s'",
ME_ERROR_LOG | ME_NOTE, srv_principal_name);
principal_name_buf.length= strlen(srv_principal_name);
principal_name_buf.value= srv_principal_name;