diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
| commit | 36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch) | |
| tree | 0d3e30ce973b2e1f044931c0eb1846d7192becda /plugin | |
| parent | 7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff) | |
| parent | 1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff) | |
| download | mariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_ed25519/server_ed25519.c | 2 | ||||
| -rw-r--r-- | plugin/auth_gssapi/gssapi_server.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugin/auth_ed25519/server_ed25519.c b/plugin/auth_ed25519/server_ed25519.c index e3f00409ae3..8870c271b18 100644 --- a/plugin/auth_ed25519/server_ed25519.c +++ b/plugin/auth_ed25519/server_ed25519.c @@ -101,7 +101,7 @@ maria_declare_plugin(ed25519) NULL, NULL, "1.0-alpha", - MariaDB_PLUGIN_MATURITY_BETA + MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; 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; |