Skip to content

Commit f64e65b

Browse files
committed
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
1 parent b2171d4 commit f64e65b

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/backend/libpq/auth.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,10 @@ static GSS_DLLIMP gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_desc;
963963
#endif
964964

965965

966+
/*
967+
* Generate an error for GSSAPI authentication. The caller should apply
968+
* _() to errmsg to make it translatable.
969+
*/
966970
static void
967971
pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
968972
{
@@ -1147,7 +1151,7 @@ pg_GSS_recvauth(Port *port)
11471151
{
11481152
gss_delete_sec_context(&lmin_s, &port->gss->ctx, GSS_C_NO_BUFFER);
11491153
pg_GSS_error(ERROR,
1150-
gettext_noop("accepting GSS security context failed"),
1154+
_("accepting GSS security context failed"),
11511155
maj_stat, min_stat);
11521156
}
11531157

@@ -1173,7 +1177,7 @@ pg_GSS_recvauth(Port *port)
11731177
maj_stat = gss_display_name(&min_stat, port->gss->name, &gbuf, NULL);
11741178
if (maj_stat != GSS_S_COMPLETE)
11751179
pg_GSS_error(ERROR,
1176-
gettext_noop("retrieving GSS user name failed"),
1180+
_("retrieving GSS user name failed"),
11771181
maj_stat, min_stat);
11781182

11791183
/*
@@ -1237,6 +1241,11 @@ pg_GSS_recvauth(Port *port)
12371241
*----------------------------------------------------------------
12381242
*/
12391243
#ifdef ENABLE_SSPI
1244+
1245+
/*
1246+
* Generate an error for SSPI authentication. The caller should apply
1247+
* _() to errmsg to make it translatable.
1248+
*/
12401249
static void
12411250
pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
12421251
{

0 commit comments

Comments
 (0)