postgres.git / summary / log / commit / refs

commit    2fcf685f6daa4f872ca726e25cc504a544916dbb
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Fri Dec 23 01:04:18 2022 +0000
First released in: 16.0, 11.19, 12.14, 13.10, 14.7, 15.2

    Fix come incorrect elog() messages in aclchk.c
    
    Three error strings used with cache lookup failures were referring to
    incorrect object types for ACL checks:
    - Schemas
    - Types
    - Foreign Servers
    There errors should never be triggered, but if they do incorrect
    information would be reported.
    
    Author: Justin Pryzby
    Discussion: https://postgr.es/m/20221222153041.GN1153@telsasoft.com
    Backpatch-through: 11


 src/backend/catalog/aclchk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index d2597bf5127..cdfd6378156 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -4369,7 +4369,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 
 		tuple = SearchSysCache1(FOREIGNSERVEROID, ObjectIdGetDatum(objoid));
 		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for foreign data wrapper %u",
+			elog(ERROR, "cache lookup failed for foreign server %u",
 				 objoid);
 
 		aclDatum = SysCacheGetAttr(FOREIGNSERVEROID, tuple,
@@ -4455,7 +4455,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 
 		tuple = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(objoid));
 		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for function %u", objoid);
+			elog(ERROR, "cache lookup failed for schema %u", objoid);
 
 		aclDatum = SysCacheGetAttr(NAMESPACEOID, tuple,
 								   Anum_pg_namespace_nspacl, &isNull);
@@ -4497,7 +4497,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 
 		tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(objoid));
 		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for function %u", objoid);
+			elog(ERROR, "cache lookup failed for type %u", objoid);
 
 		aclDatum = SysCacheGetAttr(TYPEOID, tuple, Anum_pg_type_typacl,
 								   &isNull);


[parent: 13e0d7a60385]