Fix thinko in log message for "sameuser" ident map mismatch: the provided

tglsfdc · tglsfdc · commit 16a4186d6aab · 2010-03-24T17:05:45.000Z
and authenticated usernames were swapped.  Reported by Bryan Henderson
in bug #5386.

Also clean up poorly-maintained header comment for this function.
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * 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 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
 /*
  *	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
- *	as Postgres user "pgrole" according to usermap "usermap_name".
+ *	See if the user with ident username "auth_user" is allowed to act
+ *	as Postgres user "pg_role" according to usermap "usermap_name".
  *
  *	Special case: Usermap NULL, equivalent to what was previously called
- *	"sameuser" or "samerole", means don't look in the usermap
- *	file.  That's an implied map where "pgrole" must be identical to
- *	"ident_user" in order to be authorized.
+ *	"sameuser" or "samerole", means don't look in the usermap file.
+ *	That's an implied map wherein "pg_role" must be identical to
+ *	"auth_user" in order to be authorized.
  *
  *	Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.
  */
@@ -1748,7 +1748,7 @@ check_usermap(const char *usermap_name,
 		}
 		ereport(LOG,
 				(errmsg("provided user name (%s) and authenticated user name (%s) do not match",
-						auth_user, pg_role)));
+						pg_role, auth_user)));
 		return STATUS_ERROR;
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.203 2010/03/21 00:17:58 petere Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.204 2010/03/24 17:05:45 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1715,13 +1715,13 @@ parse_ident_usermap(List line, int line_number, const char usermap_name,`
`1715`	`1715`	`/*`
`1716`	`1716`	`* Scan the (pre-parsed) ident usermap file line by line, looking for a match`
`1717`	`1717`	`*`
`1718`		`- * See if the user with ident username "ident_user" is allowed to act`
`1719`		`- * as Postgres user "pgrole" according to usermap "usermap_name".`
	`1718`	`+ * See if the user with ident username "auth_user" is allowed to act`
	`1719`	`+ * as Postgres user "pg_role" according to usermap "usermap_name".`
`1720`	`1720`	`*`
`1721`	`1721`	`* Special case: Usermap NULL, equivalent to what was previously called`
`1722`		`- * "sameuser" or "samerole", means don't look in the usermap`
`1723`		`- * file. That's an implied map where "pgrole" must be identical to`
`1724`		`- * "ident_user" in order to be authorized.`
	`1722`	`+ * "sameuser" or "samerole", means don't look in the usermap file.`
	`1723`	`+ * That's an implied map wherein "pg_role" must be identical to`
	`1724`	`+ * "auth_user" in order to be authorized.`
`1725`	`1725`	`*`
`1726`	`1726`	`* Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.`
`1727`	`1727`	`*/`
`@@ -1748,7 +1748,7 @@ check_usermap(const char *usermap_name,`
`1748`	`1748`	`}`
`1749`	`1749`	`ereport(LOG,`
`1750`	`1750`	`(errmsg("provided user name (%s) and authenticated user name (%s) do not match",`
`1751`		`- auth_user, pg_role)));`
	`1751`	`+ pg_role, auth_user)));`
`1752`	`1752`	`return STATUS_ERROR;`
`1753`	`1753`	`}`
`1754`	`1754`	`else`