summaryrefslogtreecommitdiff
path: root/plugin/auth_gssapi/gssapi_server.cc
diff options
context:
space:
mode:
Diffstat (limited to 'plugin/auth_gssapi/gssapi_server.cc')
-rw-r--r--plugin/auth_gssapi/gssapi_server.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc
index ac75a4f1593..50c34ecc573 100644
--- a/plugin/auth_gssapi/gssapi_server.cc
+++ b/plugin/auth_gssapi/gssapi_server.cc
@@ -44,26 +44,30 @@ static char* get_default_principal_name()
if(krb5_init_context(&context))
{
- sql_print_warning("GSSAPI plugin : krb5_init_context failed");
+ my_printf_error(0, "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))
{
- sql_print_warning("GSSAPI plugin : krb5_sname_to_principal failed");
+ my_printf_error(0, "GSSAPI plugin : krb5_sname_to_principal failed",
+ ME_ERROR_LOG | ME_WARNING);
goto cleanup;
}
if (krb5_unparse_name(context, principal, &unparsed_name))
{
- sql_print_warning("GSSAPI plugin : krb5_unparse_name failed");
+ my_printf_error(0, "GSSAPI plugin : krb5_unparse_name failed",
+ ME_ERROR_LOG | ME_WARNING);
goto cleanup;
}
/* Check for entry in keytab */
if (krb5_kt_read_service_key(context, NULL, principal, 0, (krb5_enctype)0, &key))
{
- sql_print_warning("GSSAPI plugin : default principal '%s' not found in keytab", unparsed_name);
+ my_printf_error(0, "GSSAPI plugin : default principal '%s' not found in keytab",
+ ME_ERROR_LOG | ME_WARNING, unparsed_name);
goto cleanup;
}
@@ -100,7 +104,8 @@ int plugin_init()
/* import service principal from plain text */
if(srv_principal_name && srv_principal_name[0])
{
- sql_print_information("GSSAPI plugin : using principal name '%s'", srv_principal_name);
+ my_printf_error(0, "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;
major= gss_import_name(&minor, &principal_name_buf, GSS_C_NT_USER_NAME, &service_name);
@@ -115,8 +120,6 @@ int plugin_init()
service_name= GSS_C_NO_NAME;
}
-
-
/* Check if SPN configuration is OK */
major= gss_acquire_cred(&minor, service_name, GSS_C_INDEFINITE,
GSS_C_NO_OID_SET, GSS_C_ACCEPT, &cred, NULL,