diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
| commit | c3289d27eef39a47fed2ce1ff239013ed6870f39 (patch) | |
| tree | 2a6e2434287921eb6f5f7c7877e8da061803ed9e /plugin/auth_gssapi/gssapi_server.cc | |
| parent | 358ae4b46dd52b329154cff901b58e96fd223773 (diff) | |
| parent | eaab98f7022732b26b4ea590e1bb44308e253be8 (diff) | |
| download | mariadb-git-c3289d27eef39a47fed2ce1ff239013ed6870f39.tar.gz | |
Merge mariadb-10.3.8 into 10.3
Diffstat (limited to 'plugin/auth_gssapi/gssapi_server.cc')
| -rw-r--r-- | plugin/auth_gssapi/gssapi_server.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc index 49d0262690e..a498aba982d 100644 --- a/plugin/auth_gssapi/gssapi_server.cc +++ b/plugin/auth_gssapi/gssapi_server.cc @@ -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; |