Fix thinko in log message for "sameuser" ident map mismatch: the provided
and authenticated usernames were swapped. Reported by Bryan Henderson in bug #5386. Also clean up poorly-maintained header comment for this function.
This commit is contained in:
parent
223f82d4da
commit
16a4186d6a
|
@ -10,7 +10,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.203 2010/03/21 00:17:58 petere Exp $
|
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.204 2010/03/24 17:05:45 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -1715,13 +1715,13 @@ ident_syntax:
|
||||||
/*
|
/*
|
||||||
* Scan the (pre-parsed) ident usermap file line by line, looking for a match
|
* Scan the (pre-parsed) ident usermap file line by line, looking for a match
|
||||||
*
|
*
|
||||||
* See if the user with ident username "ident_user" is allowed to act
|
* See if the user with ident username "auth_user" is allowed to act
|
||||||
* as Postgres user "pgrole" according to usermap "usermap_name".
|
* as Postgres user "pg_role" according to usermap "usermap_name".
|
||||||
*
|
*
|
||||||
* Special case: Usermap NULL, equivalent to what was previously called
|
* Special case: Usermap NULL, equivalent to what was previously called
|
||||||
* "sameuser" or "samerole", means don't look in the usermap
|
* "sameuser" or "samerole", means don't look in the usermap file.
|
||||||
* file. That's an implied map where "pgrole" must be identical to
|
* That's an implied map wherein "pg_role" must be identical to
|
||||||
* "ident_user" in order to be authorized.
|
* "auth_user" in order to be authorized.
|
||||||
*
|
*
|
||||||
* Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.
|
* Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.
|
||||||
*/
|
*/
|
||||||
|
@ -1748,7 +1748,7 @@ check_usermap(const char *usermap_name,
|
||||||
}
|
}
|
||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("provided user name (%s) and authenticated user name (%s) do not match",
|
(errmsg("provided user name (%s) and authenticated user name (%s) do not match",
|
||||||
auth_user, pg_role)));
|
pg_role, auth_user)));
|
||||||
return STATUS_ERROR;
|
return STATUS_ERROR;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue