mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	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
This commit is contained in:
		@@ -5652,7 +5652,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		tuple = SearchSysCache1(FOREIGNSERVEROID, ObjectIdGetDatum(objoid));
 | 
							tuple = SearchSysCache1(FOREIGNSERVEROID, ObjectIdGetDatum(objoid));
 | 
				
			||||||
		if (!HeapTupleIsValid(tuple))
 | 
							if (!HeapTupleIsValid(tuple))
 | 
				
			||||||
			elog(ERROR, "cache lookup failed for foreign data wrapper %u",
 | 
								elog(ERROR, "cache lookup failed for foreign server %u",
 | 
				
			||||||
				 objoid);
 | 
									 objoid);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		aclDatum = SysCacheGetAttr(FOREIGNSERVEROID, tuple,
 | 
							aclDatum = SysCacheGetAttr(FOREIGNSERVEROID, tuple,
 | 
				
			||||||
@@ -5738,7 +5738,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		tuple = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(objoid));
 | 
							tuple = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(objoid));
 | 
				
			||||||
		if (!HeapTupleIsValid(tuple))
 | 
							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,
 | 
							aclDatum = SysCacheGetAttr(NAMESPACEOID, tuple,
 | 
				
			||||||
								   Anum_pg_namespace_nspacl, &isNull);
 | 
													   Anum_pg_namespace_nspacl, &isNull);
 | 
				
			||||||
@@ -5780,7 +5780,7 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(objoid));
 | 
							tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(objoid));
 | 
				
			||||||
		if (!HeapTupleIsValid(tuple))
 | 
							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,
 | 
							aclDatum = SysCacheGetAttr(TYPEOID, tuple, Anum_pg_type_typacl,
 | 
				
			||||||
								   &isNull);
 | 
													   &isNull);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user