database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix bogus error message for SSL-cert authentication, due to lack of

Browse Source 
a uaCert entry in auth_failed().  Put the switch entries into a sane
order, namely the one the enum is declared in.
This commit is contained in:
Tom Lane
2010-05-26 20:47:13 +00:00
parent f9dbac9476
commit 0d046a4d72
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.200 2010/04/21 03:32:53 tgl Exp $ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.201 2010/05/26 20:47:13 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -257,30 +257,33 @@ auth_failed(Port *port, int status)
case uaKrb5: case uaKrb5:
errstr = gettext_noop("Kerberos 5 authentication failed for user \"%s\""); errstr = gettext_noop("Kerberos 5 authentication failed for user \"%s\"");
break; break;
case uaGSS:
errstr = gettext_noop("GSSAPI authentication failed for user \"%s\"");
break;
case uaSSPI:
errstr = gettext_noop("SSPI authentication failed for user \"%s\"");
break;
case uaTrust: case uaTrust:
errstr = gettext_noop("\"trust\" authentication failed for user \"%s\""); errstr = gettext_noop("\"trust\" authentication failed for user \"%s\"");
break; break;
case uaIdent: case uaIdent:
errstr = gettext_noop("Ident authentication failed for user \"%s\""); errstr = gettext_noop("Ident authentication failed for user \"%s\"");
break; break;
case uaMD5:
case uaPassword: case uaPassword:
case uaMD5:
errstr = gettext_noop("password authentication failed for user \"%s\""); errstr = gettext_noop("password authentication failed for user \"%s\"");
/* We use it to indicate if a .pgpass password failed. */ /* We use it to indicate if a .pgpass password failed. */
errcode_return = ERRCODE_INVALID_PASSWORD; errcode_return = ERRCODE_INVALID_PASSWORD;
break; break;
case uaGSS:
errstr = gettext_noop("GSSAPI authentication failed for user \"%s\"");
break;
case uaSSPI:
errstr = gettext_noop("SSPI authentication failed for user \"%s\"");
break;
case uaPAM: case uaPAM:
errstr = gettext_noop("PAM authentication failed for user \"%s\""); errstr = gettext_noop("PAM authentication failed for user \"%s\"");
break; break;
case uaLDAP: case uaLDAP:
errstr = gettext_noop("LDAP authentication failed for user \"%s\""); errstr = gettext_noop("LDAP authentication failed for user \"%s\"");
break; break;
case uaCert:
errstr = gettext_noop("certificate authentication failed for user \"%s\"");
break;
case uaRADIUS: case uaRADIUS:
errstr = gettext_noop("RADIUS authentication failed for user \"%s\""); errstr = gettext_noop("RADIUS authentication failed for user \"%s\"");
break; break;
@ -2503,7 +2506,7 @@ CheckCertAuth(Port *port)
strlen(port->peer_cn) <= 0) strlen(port->peer_cn) <= 0)
{ {
ereport(LOG, ereport(LOG,
(errmsg("Certificate login failed for user \"%s\": client certificate contains no username", (errmsg("certificate authentication failed for user \"%s\": client certificate contains no username",
port->user_name))); port->user_name)));
return STATUS_ERROR; return STATUS_ERROR;
} }