1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00

Fix set of NLS translation issues

While monitoring the code, it has been noticed that GSSAPI
authentication missed two translations.

Reported-by: Kyotaro Horiguchi
Author: Kyotaro Horiguchi
Reviewed-by: Michael Paquier, Tom Lane
Discussion: https://postgr.es/m/20180810.152131.31921918.horiguchi.kyotaro@lab.ntt.co.jp
Backpatch-through: 9.3
This commit is contained in:
Michael Paquier
2018-08-21 15:18:35 +09:00
parent b2171d472d
commit f64e65bd76

View File

@ -963,6 +963,10 @@ static GSS_DLLIMP gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_desc;
#endif #endif
/*
* Generate an error for GSSAPI authentication. The caller should apply
* _() to errmsg to make it translatable.
*/
static void static void
pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat) pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
{ {
@ -1147,7 +1151,7 @@ pg_GSS_recvauth(Port *port)
{ {
gss_delete_sec_context(&lmin_s, &port->gss->ctx, GSS_C_NO_BUFFER); gss_delete_sec_context(&lmin_s, &port->gss->ctx, GSS_C_NO_BUFFER);
pg_GSS_error(ERROR, pg_GSS_error(ERROR,
gettext_noop("accepting GSS security context failed"), _("accepting GSS security context failed"),
maj_stat, min_stat); maj_stat, min_stat);
} }
@ -1173,7 +1177,7 @@ pg_GSS_recvauth(Port *port)
maj_stat = gss_display_name(&min_stat, port->gss->name, &gbuf, NULL); maj_stat = gss_display_name(&min_stat, port->gss->name, &gbuf, NULL);
if (maj_stat != GSS_S_COMPLETE) if (maj_stat != GSS_S_COMPLETE)
pg_GSS_error(ERROR, pg_GSS_error(ERROR,
gettext_noop("retrieving GSS user name failed"), _("retrieving GSS user name failed"),
maj_stat, min_stat); maj_stat, min_stat);
/* /*
@ -1237,6 +1241,11 @@ pg_GSS_recvauth(Port *port)
*---------------------------------------------------------------- *----------------------------------------------------------------
*/ */
#ifdef ENABLE_SSPI #ifdef ENABLE_SSPI
/*
* Generate an error for SSPI authentication. The caller should apply
* _() to errmsg to make it translatable.
*/
static void static void
pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r) pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
{ {